Fixing kb and `sorted imports`

Powers/__init__.py

@@ -1,12 +1,12 @@
-from time import time
 from datetime import datetime
-from traceback import format_exc
-from os import path, mkdir, environ
 from importlib import import_module as imp_mod
-from sys import exit as sysexit, stdout, version_info
-from logging import (
-    INFO, WARNING, FileHandler, StreamHandler, getLogger, basicConfig)
-
+from logging import (INFO, WARNING, FileHandler, StreamHandler, basicConfig,
+                     getLogger)
+from os import environ, mkdir, path
+from sys import exit as sysexit
+from sys import stdout, version_info
+from time import time
+from traceback import format_exc
 
 LOG_DATETIME = datetime.now().strftime("%d_%m_%Y-%H_%M_%S")
 LOGDIR = f"{__name__}/logs"

Powers/__main__.py

@@ -1,5 +1,4 @@
 from Powers.bot_class import Gojo
 
-
 if __name__ == "__main__":
     Gojo().run()

Powers/bot_class.py

@@ -1,16 +1,16 @@
+from platform import python_version
 from threading import RLock
-from Powers.vars import Config
+from time import gmtime, strftime, time
+
 from aiohttp import ClientSession
+from pyrogram import Client, __version__
 from pyrogram.raw.all import layer
+
+from Powers import (API_HASH, API_ID, BOT_TOKEN, LOG_DATETIME, LOGFILE, LOGGER,
+                    MESSAGE_DUMP, NO_LOAD, UPTIME, WORKERS, load_cmds)
 from Powers.database import MongoDB
-from platform import python_version
 from Powers.plugins import all_plugins
-from time import time, gmtime, strftime
-from pyrogram import Client, __version__
-from Powers import (
-    API_ID, LOGGER, UPTIME, LOGFILE, NO_LOAD, WORKERS, API_HASH, BOT_TOKEN,
-    LOG_DATETIME, MESSAGE_DUMP, load_cmds)
-
+from Powers.vars import Config
 
 INITIAL_LOCK = RLock()
 

Powers/database/__init__.py

@@ -1,8 +1,9 @@
 from sys import exit as exiter
+
 from pymongo import MongoClient
 from pymongo.errors import PyMongoError
-from Powers import DB_URI, LOGGER, DB_NAME
 
+from Powers import DB_NAME, DB_URI, LOGGER
 
 try:
     Powers_db_client = MongoClient(DB_URI)

Powers/database/antispam_db.py

@@ -1,7 +1,7 @@
-from threading import RLock
 from datetime import datetime
-from Powers.database import MongoDB
+from threading import RLock
 
+from Powers.database import MongoDB
 
 INSERTION_LOCK = RLock()
 ANTISPAM_BANNED = set()

Powers/database/approve_db.py

@@ -1,7 +1,7 @@
-from Powers import LOGGER
 from threading import RLock
-from Powers.database import MongoDB
 
+from Powers import LOGGER
+from Powers.database import MongoDB
 
 INSERTION_LOCK = RLock()
 

Powers/database/blacklist_db.py

@@ -1,9 +1,9 @@
+from threading import RLock
 from time import time
+
 from Powers import LOGGER
-from threading import RLock
 from Powers.database import MongoDB
 
-
 INSERTION_LOCK = RLock()
 
 

Powers/database/chats_db.py

@@ -1,9 +1,9 @@
+from threading import RLock
 from time import time
+
 from Powers import LOGGER
-from threading import RLock
 from Powers.database import MongoDB
 
-
 INSERTION_LOCK = RLock()
 
 

Powers/database/disable_db.py

@@ -1,9 +1,9 @@
+from threading import RLock
 from time import time
+
 from Powers import LOGGER
-from threading import RLock
 from Powers.database import MongoDB
 
-
 INSERTION_LOCK = RLock()
 DISABLED_CMDS = {}
 

Powers/database/filters_db.py

@@ -1,8 +1,8 @@
 from threading import RLock
+
 from Powers.database import MongoDB
 from Powers.utils.msg_types import Types
 
-
 INSERTION_LOCK = RLock()
 
 

Powers/database/greetings_db.py

@@ -1,7 +1,7 @@
-from Powers import LOGGER
 from threading import RLock
-from Powers.database import MongoDB
 
+from Powers import LOGGER
+from Powers.database import MongoDB
 
 INSERTION_LOCK = RLock()
 

Powers/database/group_blacklist.py

@@ -1,8 +1,8 @@
 from threading import RLock
+
 from Powers.database import MongoDB
 from Powers.database.chats_db import Chats
 
-
 INSERTION_LOCK = RLock()
 BLACKLIST_CHATS = []
 

Powers/database/notes_db.py

@@ -1,10 +1,10 @@
-from time import time
 from hashlib import md5
 from threading import RLock
+from time import time
+
 from Powers.database import MongoDB
 from Powers.utils.msg_types import Types
 
-
 INSERTION_LOCK = RLock()
 
 

Powers/database/pins_db.py

@@ -1,7 +1,7 @@
-from Powers import LOGGER
 from threading import RLock
-from Powers.database import MongoDB
 
+from Powers import LOGGER
+from Powers.database import MongoDB
 
 INSERTION_LOCK = RLock()
 

Powers/database/reporting_db.py

@@ -1,9 +1,9 @@
+from threading import RLock
 from time import time
+
 from Powers import LOGGER
-from threading import RLock
 from Powers.database import MongoDB
 
-
 INSERTION_LOCK = RLock()
 
 

Powers/database/rules_db.py

@@ -1,9 +1,9 @@
+from threading import RLock
 from time import time
+
 from Powers import LOGGER
-from threading import RLock
 from Powers.database import MongoDB
 
-
 INSERTION_LOCK = RLock()
 
 

Powers/database/users_db.py

@@ -1,9 +1,9 @@
+from threading import RLock
 from time import time
+
 from Powers import LOGGER
-from threading import RLock
 from Powers.database import MongoDB
 
-
 INSERTION_LOCK = RLock()
 
 

Powers/database/warns_db.py

@@ -1,9 +1,9 @@
+from threading import RLock
 from time import time
+
 from Powers import LOGGER
-from threading import RLock
 from Powers.database import MongoDB
 
-
 INSERTION_LOCK = RLock()
 
 

Powers/plugins/__init__.py

@@ -3,7 +3,7 @@ async def all_plugins():
     # work.
 
     from glob import glob
-    from os.path import isfile, dirname, basename
+    from os.path import basename, dirname, isfile
 
     mod_paths = glob(dirname(__file__) + "/*.py")
     all_plugs = [

Powers/plugins/admin.py

@@ -1,24 +1,27 @@
-from os import remove
-from html import escape
 from asyncio import sleep
-from pyrogram import filters
-from Powers.vars import Config
+from html import escape
+from os import remove
 from traceback import format_exc
+
+from pyrogram import filters
+from pyrogram.enums import ChatMemberStatus as CMS
+from pyrogram.enums import ChatType
+from pyrogram.errors import (ChatAdminInviteRequired, ChatAdminRequired,
+                             FloodWait, RightForbidden, RPCError,
+                             UserAdminInvalid)
+from pyrogram.types import ChatPrivileges, Message
+
+from Powers import DEV_USERS, LOGGER, OWNER_ID, SUPPORT_GROUP, SUPPORT_STAFF
 from Powers.bot_class import Gojo
-from Powers.utils.parser import mention_html
 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.custom_filters import (DEV_LEVEL, admin_filter, command,
+                                         owner_filter, promote_filter)
 from Powers.utils.extract_user import extract_user
-from pyrogram.types import Message, ChatPrivileges
-from pyrogram.enums import ChatType, ChatMemberStatus as CMS
-from Powers import LOGGER, OWNER_ID, DEV_USERS, SUPPORT_GROUP, SUPPORT_STAFF
-from Powers.utils.caching import (
-    ADMIN_CACHE, TEMP_ADMIN_CACHE_BLOCK, admin_cache_reload)
-from Powers.utils.custom_filters import (
-    DEV_LEVEL, command, admin_filter, owner_filter, promote_filter)
-from pyrogram.errors import (
-    RPCError, FloodWait, RightForbidden, UserAdminInvalid, ChatAdminRequired,
-    ChatAdminInviteRequired)
+from Powers.utils.parser import mention_html
+from Powers.vars import Config
 
 
 @Gojo.on_message(command("adminlist"))

Powers/plugins/antispam.py

@@ -1,18 +1,19 @@
-from io import BytesIO
 from datetime import datetime
-from Powers.vars import Config
+from io import BytesIO
 from traceback import format_exc
-from Powers.bot_class import Gojo
+
+from pyrogram.errors import MessageTooLong, PeerIdInvalid, UserIsBlocked
 from pyrogram.types import Message
-from Powers.database.users_db import Users
+
+from Powers import LOGGER, MESSAGE_DUMP, SUPPORT_GROUP, SUPPORT_STAFF
+from Powers.bot_class import Gojo
 from Powers.database.antispam_db import GBan
-from Powers.utils.parser import mention_html
+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.extract_user import extract_user
-from Powers.utils.clean_file import remove_markdown_and_html
-from Powers import LOGGER, MESSAGE_DUMP, SUPPORT_GROUP, SUPPORT_STAFF
-from pyrogram.errors import PeerIdInvalid, UserIsBlocked, MessageTooLong
-
+from Powers.utils.parser import mention_html
+from Powers.vars import Config
 
 # Initialize
 db = GBan()

Powers/plugins/approve.py

@@ -1,14 +1,15 @@
 from pyrogram import filters
-from Powers.bot_class import Gojo
-from Powers.utils.kbhelpers import ikb
+from pyrogram.enums import ChatMemberStatus as CMS
+from pyrogram.errors import PeerIdInvalid, RPCError, UserNotParticipant
+from pyrogram.types import CallbackQuery, Message
+
 from Powers import LOGGER, SUPPORT_GROUP
-from Powers.utils.parser import mention_html
+from Powers.bot_class import Gojo
 from Powers.database.approve_db import Approve
-from pyrogram.types import Message, CallbackQuery
+from Powers.utils.custom_filters import admin_filter, command, owner_filter
 from Powers.utils.extract_user import extract_user
-from pyrogram.enums import ChatMemberStatus as CMS
-from pyrogram.errors import RPCError, PeerIdInvalid, UserNotParticipant
-from Powers.utils.custom_filters import command, admin_filter, owner_filter
+from Powers.utils.kbhelpers import ikb
+from Powers.utils.parser import mention_html
 
 
 @Gojo.on_message(command("approve") & admin_filter)

Powers/plugins/bans.py

@@ -1,21 +1,22 @@
 from random import choice
-from pyrogram import enums
-from Powers.vars import Config
 from traceback import format_exc
-from Powers.bot_class import Gojo
+
+from pyrogram import enums
+from pyrogram.errors import (ChatAdminRequired, PeerIdInvalid, RightForbidden,
+                             RPCError, UserAdminInvalid)
 from pyrogram.filters import regex
-from Powers.utils.parser import mention_html
-from Powers.utils.string import extract_time
-from Powers.utils.extract_user import extract_user
-from Powers.utils.extras import BAN_GIFS, KICK_GIFS
+from pyrogram.types import (CallbackQuery, InlineKeyboardButton,
+                            InlineKeyboardMarkup, Message)
+
+from Powers import LOGGER, OWNER_ID, SUPPORT_GROUP, SUPPORT_STAFF
+from Powers.bot_class import Gojo
 from Powers.utils.caching import ADMIN_CACHE, admin_cache_reload
 from Powers.utils.custom_filters import command, restrict_filter
-from Powers import LOGGER, OWNER_ID, SUPPORT_GROUP, SUPPORT_STAFF
-from pyrogram.types import (
-    Message, CallbackQuery, InlineKeyboardButton, InlineKeyboardMarkup)
-from pyrogram.errors import (
-    RPCError, PeerIdInvalid, RightForbidden, UserAdminInvalid,
-    ChatAdminRequired)
+from Powers.utils.extract_user import extract_user
+from Powers.utils.extras import BAN_GIFS, KICK_GIFS
+from Powers.utils.parser import mention_html
+from Powers.utils.string import extract_time
+from Powers.vars import Config
 
 
 @Gojo.on_message(command("tban") & restrict_filter)

Powers/plugins/blacklist.py

@@ -1,12 +1,14 @@
 from html import escape
-from Powers import LOGGER
+
 from pyrogram import filters
+from pyrogram.enums import ChatMemberStatus as CMS
+from pyrogram.types import CallbackQuery, Message
+
+from Powers import LOGGER
 from Powers.bot_class import Gojo
-from Powers.utils.kbhelpers import ikb
-from pyrogram.types import Message, CallbackQuery
 from Powers.database.blacklist_db import Blacklist
-from pyrogram.enums import ChatMemberStatus as CMS
 from Powers.utils.custom_filters import command, owner_filter, restrict_filter
+from Powers.utils.kbhelpers import ikb
 
 
 @Gojo.on_message(command("blacklist") & filters.group)

Powers/plugins/botstaff.py

@@ -1,9 +1,10 @@
-from Powers.bot_class import Gojo
-from pyrogram.types import Message
 from pyrogram.errors import RPCError
-from Powers.utils.parser import mention_html
+from pyrogram.types import Message
+
+from Powers import DEV_USERS, LOGGER, OWNER_ID, SUDO_USERS, WHITELIST_USERS
+from Powers.bot_class import Gojo
 from Powers.utils.custom_filters import command
-from Powers import LOGGER, OWNER_ID, DEV_USERS, SUDO_USERS, WHITELIST_USERS
+from Powers.utils.parser import mention_html
 
 
 @Gojo.on_message(command("botstaff", dev_cmd=True))

Powers/plugins/chat_blacklist.py

@@ -1,11 +1,12 @@
-from Powers import LOGGER
 from traceback import format_exc
-from Powers.bot_class import Gojo
+
+from pyrogram.errors import PeerIdInvalid, RPCError
 from pyrogram.types import Message
-from Powers.utils.custom_filters import command
-from pyrogram.errors import RPCError, PeerIdInvalid
-from Powers.database.group_blacklist import GroupBlacklist
 
+from Powers import LOGGER
+from Powers.bot_class import Gojo
+from Powers.database.group_blacklist import GroupBlacklist
+from Powers.utils.custom_filters import command
 
 # initialise database
 db = GroupBlacklist()

Powers/plugins/dev.py

@@ -1,19 +1,21 @@
 import sys
+from asyncio import create_subprocess_shell, sleep, subprocess
 from io import BytesIO, StringIO
+from time import gmtime, strftime, time
 from traceback import format_exc
-from Powers.bot_class import Gojo
+
+from pyrogram.errors import (ChannelInvalid, ChannelPrivate, ChatAdminRequired,
+                             EntityBoundsInvalid, FloodWait, MessageTooLong,
+                             PeerIdInvalid, RPCError)
 from pyrogram.types import Message
-from Powers.utils.http_helper import *
-from time import time, gmtime, strftime
+
+from Powers import LOGFILE, LOGGER, MESSAGE_DUMP, UPTIME
+from Powers.bot_class import Gojo
 from Powers.database.chats_db import Chats
+from Powers.utils.clean_file import remove_markdown_and_html
 from Powers.utils.custom_filters import command
+from Powers.utils.http_helper import *
 from Powers.utils.parser import mention_markdown
-from Powers import LOGGER, UPTIME, LOGFILE, MESSAGE_DUMP
-from Powers.utils.clean_file import remove_markdown_and_html
-from asyncio import sleep, subprocess, create_subprocess_shell
-from pyrogram.errors import (
-    RPCError, FloodWait, PeerIdInvalid, ChannelInvalid, ChannelPrivate,
-    MessageTooLong, ChatAdminRequired, EntityBoundsInvalid)
 
 
 @Gojo.on_message(command("ping", sudo_cmd=True))

Powers/plugins/disable.py

@@ -1,13 +1,15 @@
 from html import escape
+
 from pyrogram import filters
+from pyrogram.enums import ChatMemberStatus as CMS
+from pyrogram.types import (CallbackQuery, InlineKeyboardButton,
+                            InlineKeyboardMarkup, Message)
+
+from Powers import HELP_COMMANDS, LOGGER
 from Powers.bot_class import Gojo
-from Powers import LOGGER, HELP_COMMANDS
 from Powers.database.disable_db import Disabling
-from pyrogram.enums import ChatMemberStatus as CMS
-from pyrogram.types import (
-    Message, CallbackQuery, InlineKeyboardButton, InlineKeyboardMarkup)
-from Powers.utils.custom_filters import (
-    command, admin_filter, owner_filter, can_change_filter)
+from Powers.utils.custom_filters import (admin_filter, can_change_filter,
+                                         command, owner_filter)
 
 
 @Gojo.on_message(command("disable") & can_change_filter)

Powers/plugins/filters.py

@@ -1,21 +1,22 @@
+from re import escape as re_escape
 from secrets import choice
-from pyrogram import filters
 from traceback import format_exc
-from re import escape as re_escape
+
+from pyrogram import filters
+from pyrogram.enums import ChatMemberStatus as CMS
 from pyrogram.errors import RPCError
-from Powers.utils.kbhelpers import ikb
+from pyrogram.types import CallbackQuery, InlineKeyboardMarkup, Message
+
 from Powers.bot_class import LOGGER, Gojo
-from Powers.utils.cmd_senders import send_cmd
 from Powers.database.filters_db import Filters
-from pyrogram.enums import ChatMemberStatus as CMS
-from Powers.utils.regex_utils import regex_searcher
+from Powers.utils.cmd_senders import send_cmd
+from Powers.utils.custom_filters import admin_filter, command, owner_filter
+from Powers.utils.kbhelpers import ikb
 from Powers.utils.msg_types import Types, get_filter_type
-from pyrogram.types import Message, CallbackQuery, InlineKeyboardMarkup
-from Powers.utils.custom_filters import command, admin_filter, owner_filter
-from Powers.utils.string import (
-    parse_button, split_quotes, build_keyboard,
-    escape_mentions_using_curly_brackets)
-
+from Powers.utils.regex_utils import regex_searcher
+from Powers.utils.string import (build_keyboard,
+                                 escape_mentions_using_curly_brackets,
+                                 parse_button, split_quotes)
 
 # Initialise
 db = Filters()

Powers/plugins/formatting.py

@@ -1,9 +1,10 @@
+from pyrogram import enums, filters
+from pyrogram.types import CallbackQuery, Message
+
 from Powers import LOGGER
 from Powers.bot_class import Gojo
-from pyrogram import enums, filters
-from Powers.utils.kbhelpers import ikb
 from Powers.utils.custom_filters import command
-from pyrogram.types import Message, CallbackQuery
+from Powers.utils.kbhelpers import ikb
 
 
 async def gen_formatting_kb(m):
@@ -14,8 +15,9 @@ async def gen_formatting_kb(m):
                 ("Fillings", "formatting.fillings"),
             ],
             [("Random Content", "formatting.random_content")],
-            [("« " + "Back", "commands")],
         ],
+        True,
+        "commands"
     )
 
 

Powers/plugins/fun.py

@@ -1,14 +1,17 @@
 from html import escape
 from random import choice
+
 from pyrogram import enums
-from Powers.utils import extras
-from Powers.bot_class import Gojo
-from pyrogram.types import Message
-from Powers import LOGGER, DEV_USERS
 from pyrogram.errors import MessageTooLong
+from pyrogram.types import Message
+
+from Powers import DEV_USERS, LOGGER
+from Powers.bot_class import Gojo
+from Powers.utils import extras
 from Powers.utils.custom_filters import command
 from Powers.utils.extract_user import extract_user
-from Powers.utils.extras import NOWYES as NO, YESWNO as YES
+from Powers.utils.extras import NOWYES as NO
+from Powers.utils.extras import YESWNO as YES
 
 
 @Gojo.on_message(command("shout"))

Powers/plugins/greetings.py

@@ -1,20 +1,21 @@
 from html import escape
 from secrets import choice
+
+from pyrogram import enums, filters
+from pyrogram.enums import ChatMemberStatus as CMS
+from pyrogram.errors import ChatAdminRequired, RPCError
+from pyrogram.types import ChatMemberUpdated, InlineKeyboardMarkup, Message
+
 from Powers import DEV_USERS
-from Powers.vars import Config
 from Powers.bot_class import Gojo
-from pyrogram import enums, filters
 from Powers.database.antispam_db import GBan
 from Powers.database.greetings_db import Greetings
-from pyrogram.enums import ChatMemberStatus as CMS
+from Powers.utils.custom_filters import admin_filter, bot_admin_filter, command
 from Powers.utils.msg_types import Types, get_wlcm_type
-from pyrogram.errors import RPCError, ChatAdminRequired
-from Powers.utils.parser import mention_html, escape_markdown
-from pyrogram.types import Message, ChatMemberUpdated, InlineKeyboardMarkup
-from Powers.utils.custom_filters import command, admin_filter, bot_admin_filter
-from Powers.utils.string import (
-    parse_button, build_keyboard, escape_invalid_curly_brackets)
-
+from Powers.utils.parser import escape_markdown, mention_html
+from Powers.utils.string import (build_keyboard, escape_invalid_curly_brackets,
+                                 parse_button)
+from Powers.vars import Config
 
 # Initialize
 gdb = GBan()

Powers/plugins/info.py

@@ -1,18 +1,19 @@
 import os
 from asyncio import sleep
-from pyrogram import enums
 from datetime import datetime
-from Powers.vars import Config
 from traceback import format_exc
-from Powers.bot_class import Gojo
+
+from pyrogram import enums
+from pyrogram.errors import EntityBoundsInvalid, MediaCaptionTooLong, RPCError
 from pyrogram.types import Message
+
+from Powers import (DEV_USERS, LOGGER, SUDO_USERS, SUPPORT_STAFF,
+                    WHITELIST_USERS)
+from Powers.bot_class import Gojo
 from Powers.database.antispam_db import GBan
 from Powers.utils.custom_filters import command
 from Powers.utils.extract_user import extract_user
-from pyrogram.errors import RPCError, EntityBoundsInvalid, MediaCaptionTooLong
-from Powers import (
-    LOGGER, DEV_USERS, SUDO_USERS, SUPPORT_STAFF, WHITELIST_USERS)
-
+from Powers.vars import Config
 
 gban_db = GBan()
 

Powers/plugins/initial.py

@@ -1,19 +1,20 @@
-from Powers import LOGGER
 from pyrogram import filters
-from Powers.bot_class import Gojo
-from pyrogram.types import Message
 from pyrogram.errors import RPCError
-from Powers.database.pins_db import Pins
-from Powers.database.chats_db import Chats
-from Powers.database.rules_db import Rules
-from Powers.database.users_db import Users
+from pyrogram.types import Message
+
+from Powers import LOGGER
+from Powers.bot_class import Gojo
 from Powers.database.approve_db import Approve
-from Powers.database.filters_db import Filters
-from Powers.database.disable_db import Disabling
 from Powers.database.blacklist_db import Blacklist
+from Powers.database.chats_db import Chats
+from Powers.database.disable_db import Disabling
+from Powers.database.filters_db import Filters
 from Powers.database.greetings_db import Greetings
-from Powers.database.reporting_db import Reporting
 from Powers.database.notes_db import Notes, NotesSettings
+from Powers.database.pins_db import Pins
+from Powers.database.reporting_db import Reporting
+from Powers.database.rules_db import Rules
+from Powers.database.users_db import Users
 
 
 @Gojo.on_message(filters.group, group=4)

Powers/plugins/locks.py

@@ -1,10 +1,12 @@
-from Powers import LOGGER
 from asyncio import sleep
+
+from pyrogram.errors import ChatAdminRequired, ChatNotModified, RPCError
+from pyrogram.types import ChatPermissions, Message
+
+from Powers import LOGGER
 from Powers.bot_class import Gojo
 from Powers.database.approve_db import Approve
-from pyrogram.types import Message, ChatPermissions
 from Powers.utils.custom_filters import command, restrict_filter
-from pyrogram.errors import RPCError, ChatNotModified, ChatAdminRequired
 
 
 @Gojo.on_message(command("locktypes"))

Powers/plugins/muting.py

@@ -1,19 +1,21 @@
 from random import choice
-from Powers.vars import Config
-from Powers.bot_class import Gojo
+
+from pyrogram.errors import (ChatAdminRequired, RightForbidden, RPCError,
+                             UserNotParticipant)
 from pyrogram.filters import regex
+from pyrogram.types import (CallbackQuery, ChatPermissions,
+                            InlineKeyboardButton, InlineKeyboardMarkup,
+                            Message)
+
+from Powers import LOGGER, OWNER_ID, SUPPORT_GROUP, SUPPORT_STAFF
+from Powers.bot_class import Gojo
+from Powers.utils.caching import ADMIN_CACHE, admin_cache_reload
+from Powers.utils.custom_filters import command, restrict_filter
+from Powers.utils.extract_user import extract_user
 from Powers.utils.extras import MUTE_GIFS
 from Powers.utils.parser import mention_html
 from Powers.utils.string import extract_time
-from Powers.utils.extract_user import extract_user
-from Powers.utils.caching import ADMIN_CACHE, admin_cache_reload
-from Powers.utils.custom_filters import command, restrict_filter
-from Powers import LOGGER, OWNER_ID, SUPPORT_GROUP, SUPPORT_STAFF
-from pyrogram.errors import (
-    RPCError, RightForbidden, ChatAdminRequired, UserNotParticipant)
-from pyrogram.types import (
-    Message, CallbackQuery, ChatPermissions, InlineKeyboardButton,
-    InlineKeyboardMarkup)
+from Powers.vars import Config
 
 
 @Gojo.on_message(command("tmute") & restrict_filter)

Powers/plugins/notes.py

@@ -1,20 +1,22 @@
-from Powers import LOGGER
 from secrets import choice
-from Powers.vars import Config
 from traceback import format_exc
-from Powers.bot_class import Gojo
+
 from pyrogram import enums, filters
+from pyrogram.enums import ChatMemberStatus as CMS
 from pyrogram.errors import RPCError
-from Powers.utils.kbhelpers import ikb
+from pyrogram.types import CallbackQuery, InlineKeyboardMarkup, Message
+
+from Powers import LOGGER
+from Powers.bot_class import Gojo
+from Powers.database.notes_db import Notes, NotesSettings
 from Powers.utils.cmd_senders import send_cmd
-from pyrogram.enums import ChatMemberStatus as CMS
+from Powers.utils.custom_filters import admin_filter, command, owner_filter
+from Powers.utils.kbhelpers import ikb
 from Powers.utils.msg_types import Types, get_note_type
-from Powers.database.notes_db import Notes, NotesSettings
-from pyrogram.types import Message, CallbackQuery, InlineKeyboardMarkup
-from Powers.utils.custom_filters import command, admin_filter, owner_filter
-from Powers.utils.string import (
-    parse_button, build_keyboard, escape_mentions_using_curly_brackets)
-
+from Powers.utils.string import (build_keyboard,
+                                 escape_mentions_using_curly_brackets,
+                                 parse_button)
+from Powers.vars import Config
 
 # Initialise
 db = Notes()

Powers/plugins/pin.py

@@ -1,14 +1,16 @@
-from Powers.bot_class import Gojo
-from pyrogram.filters import regex
-from Powers.utils.kbhelpers import ikb
 from html import escape as escape_html
+
+from pyrogram.enums import ChatMemberStatus as CMS
+from pyrogram.errors import ChatAdminRequired, RightForbidden, RPCError
+from pyrogram.filters import regex
+from pyrogram.types import CallbackQuery, Message
+
 from Powers import LOGGER, SUPPORT_GROUP
+from Powers.bot_class import Gojo
 from Powers.database.pins_db import Pins
-from pyrogram.types import Message, CallbackQuery
-from pyrogram.enums import ChatMemberStatus as CMS
-from Powers.utils.string import parse_button, build_keyboard
-from Powers.utils.custom_filters import command, admin_filter
-from pyrogram.errors import RPCError, RightForbidden, ChatAdminRequired
+from Powers.utils.custom_filters import admin_filter, command
+from Powers.utils.kbhelpers import ikb
+from Powers.utils.string import build_keyboard, parse_button
 
 
 @Gojo.on_message(command("pin") & admin_filter)

Powers/plugins/purge.py

@@ -1,10 +1,12 @@
 from asyncio import sleep
+
+from pyrogram.enums import ChatType
+from pyrogram.errors import MessageDeleteForbidden, RPCError
+from pyrogram.types import Message
+
 from Powers import SUPPORT_GROUP
 from Powers.bot_class import Gojo
-from pyrogram.types import Message
-from pyrogram.enums import ChatType
-from pyrogram.errors import RPCError, MessageDeleteForbidden
-from Powers.utils.custom_filters import command, admin_filter
+from Powers.utils.custom_filters import admin_filter, command
 
 
 @Gojo.on_message(command("purge") & admin_filter)

Powers/plugins/report.py

@@ -1,14 +1,17 @@
-from pyrogram import filters
 from traceback import format_exc
-from Powers.bot_class import Gojo
+
+from pyrogram import filters
+from pyrogram.enums import ChatMembersFilter as cmf
+from pyrogram.enums import ChatType
 from pyrogram.errors import RPCError
-from Powers.utils.kbhelpers import ikb
+from pyrogram.types import CallbackQuery, Message
+
 from Powers import LOGGER, SUPPORT_STAFF
-from Powers.utils.parser import mention_html
-from pyrogram.types import Message, CallbackQuery
+from Powers.bot_class import Gojo
 from Powers.database.reporting_db import Reporting
-from Powers.utils.custom_filters import command, admin_filter
-from pyrogram.enums import ChatType, ChatMembersFilter as cmf
+from Powers.utils.custom_filters import admin_filter, command
+from Powers.utils.kbhelpers import ikb
+from Powers.utils.parser import mention_html
 
 
 @Gojo.on_message(

Powers/plugins/rules.py

@@ -1,11 +1,12 @@
-from Powers import LOGGER
 from pyrogram import filters
-from Powers.vars import Config
+from pyrogram.types import CallbackQuery, Message
+
+from Powers import LOGGER
 from Powers.bot_class import Gojo
-from Powers.utils.kbhelpers import ikb
 from Powers.database.rules_db import Rules
-from pyrogram.types import Message, CallbackQuery
-from Powers.utils.custom_filters import command, admin_filter
+from Powers.utils.custom_filters import admin_filter, command
+from Powers.utils.kbhelpers import ikb
+from Powers.vars import Config
 
 
 @Gojo.on_message(command("rules") & filters.group)

Powers/plugins/start.py

@@ -1,17 +1,19 @@
 from random import choice
-from Powers.vars import Config
-from Powers.bot_class import Gojo
+
 from pyrogram import enums, filters
-from Powers.utils.kbhelpers import ikb
-from Powers import LOGGER, HELP_COMMANDS
-from Powers.utils.extras import StartPic
+from pyrogram.enums import ChatMemberStatus as CMS
+from pyrogram.enums import ChatType
+from pyrogram.errors import MessageNotModified, QueryIdInvalid, UserIsBlocked
+from pyrogram.types import CallbackQuery, Message
+
+from Powers import HELP_COMMANDS, LOGGER
+from Powers.bot_class import Gojo
 from Powers.utils.custom_filters import command
-from pyrogram.types import Message, CallbackQuery
-from pyrogram.enums import ChatType, ChatMemberStatus as CMS
-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,
-    get_private_rules)
+from Powers.utils.extras import StartPic
+from Powers.utils.kbhelpers import ikb
+from Powers.utils.start_utils import (gen_cmds_kb, gen_start_kb, get_help_msg,
+                                      get_private_note, get_private_rules)
+from Powers.vars import Config
 
 
 @Gojo.on_message(
@@ -145,9 +147,7 @@ Join my [News Channel](http://t.me/gojo_bots_network) to get information on all
 
 @Gojo.on_callback_query(filters.regex("^commands$"))
 async def commands_menu(_, q: CallbackQuery):
-    cmds = sorted(list(HELP_COMMANDS.keys()))
-    kb = [cmd.lower() for cmd in cmds]
-    ou = [kb[i : i + 3] for i in range(0, len(kb), 3)]
+    ou = await gen_cmds_kb(q.message)
     keyboard = ikb(ou, True)
     try:
         cpt = f"""
@@ -218,9 +218,7 @@ async def help_menu(_, m: Message):
     else:
 
         if m.chat.type == ChatType.PRIVATE:
-            cmds = sorted(list(HELP_COMMANDS.keys()))
-            kb = [cmd.lower() for cmd in cmds]
-            ou = [kb[i : i + 3] for i in range(0, len(kb), 3)]
+            ou = await gen_cmds_kb(m)
             keyboard = ikb(ou, True)
             msg = f"""
 Hey **[{m.from_user.first_name}](http://t.me/{m.from_user.username})**!My name is Gojo✨.
@@ -247,15 +245,13 @@ Commands available:
 async def get_module_info(_, q: CallbackQuery):
     module = q.data.split(".", 1)[1]
 
-    help_msg = (f"**{str(module)}:**\n\n" + HELP_COMMANDS[module]["help_msg"],)
+    help_msg = (f"**{str(module)}:**\n\n" + HELP_COMMANDS[f"plugins.{module}"]["help_msg"],)
 
-    help_kb = HELP_COMMANDS[module]["buttons"] + [
-        [("« " + "Back", "commands")],
-    ]
+    help_kb = HELP_COMMANDS[f"plugins.{module}"]["buttons"]
     await q.edit_message_caption(
         caption=help_msg,
         parse_mode=enums.ParseMode.MARKDOWN,
-        reply_markup=ikb(help_kb),
+        reply_markup=ikb(help_kb, True, todo="commands"),
     )
     await q.answer()
     return

Powers/plugins/stats.py

@@ -1,19 +1,20 @@
 from pyrogram import enums
-from Powers.bot_class import Gojo
 from pyrogram.types import Message
-from Powers.database.pins_db import Pins
-from Powers.database.chats_db import Chats
-from Powers.database.rules_db import Rules
-from Powers.database.users_db import Users
+
+from Powers.bot_class import Gojo
 from Powers.database.antispam_db import GBan
 from Powers.database.approve_db import Approve
-from Powers.database.filters_db import Filters
-from Powers.utils.custom_filters import command
-from Powers.database.disable_db import Disabling
 from Powers.database.blacklist_db import Blacklist
+from Powers.database.chats_db import Chats
+from Powers.database.disable_db import Disabling
+from Powers.database.filters_db import Filters
 from Powers.database.greetings_db import Greetings
-from Powers.database.warns_db import Warns, WarnSettings
 from Powers.database.notes_db import Notes, NotesSettings
+from Powers.database.pins_db import Pins
+from Powers.database.rules_db import Rules
+from Powers.database.users_db import Users
+from Powers.database.warns_db import Warns, WarnSettings
+from Powers.utils.custom_filters import command
 
 
 @Gojo.on_message(command("stats", dev_cmd=True))

Powers/plugins/utils.py

@@ -1,21 +1,23 @@
-import re
 import asyncio
-import aiofiles
-from Powers import *
-from os import remove
+import re
 from io import BytesIO
-from wikipedia import summary
-from Powers.bot_class import Gojo
+from os import remove
+
+import aiofiles
 from gpytranslate import Translator
 from pyrogram import enums, filters
 from pyrogram.enums import ChatType
-from Powers.utils.http_helper import *
-from Powers.database.users_db import Users
 from pyrogram.errors import MessageTooLong
-from Powers.utils.custom_filters import command
+from pyrogram.types import InlineKeyboardButton, InlineKeyboardMarkup, Message
+from wikipedia import summary
+from wikipedia.exceptions import DisambiguationError, PageError
+
+from Powers import *
+from Powers.bot_class import Gojo
+from Powers.database.users_db import Users
 from Powers.utils.clean_file import remove_markdown_and_html
-from wikipedia.exceptions import PageError, DisambiguationError
-from pyrogram.types import Message, InlineKeyboardButton, InlineKeyboardMarkup
+from Powers.utils.custom_filters import command
+from Powers.utils.http_helper import *
 
 
 @Gojo.on_message(command("wiki"))

Powers/plugins/warns.py

@@ -1,19 +1,21 @@
 from time import time
+
 from pyrogram import filters
-from Powers.vars import Config
-from Powers.bot_class import Gojo
 from pyrogram.errors import RPCError
+from pyrogram.types import (CallbackQuery, ChatPermissions,
+                            InlineKeyboardButton, InlineKeyboardMarkup,
+                            Message)
+
 from Powers import LOGGER, SUPPORT_STAFF
+from Powers.bot_class import Gojo
 from Powers.database.rules_db import Rules
 from Powers.database.users_db import Users
-from Powers.utils.parser import mention_html
-from Powers.utils.extract_user import extract_user
 from Powers.database.warns_db import Warns, WarnSettings
 from Powers.utils.caching import ADMIN_CACHE, admin_cache_reload
-from Powers.utils.custom_filters import command, admin_filter, restrict_filter
-from pyrogram.types import (
-    Message, CallbackQuery, ChatPermissions, InlineKeyboardButton,
-    InlineKeyboardMarkup)
+from Powers.utils.custom_filters import admin_filter, command, restrict_filter
+from Powers.utils.extract_user import extract_user
+from Powers.utils.parser import mention_html
+from Powers.vars import Config
 
 
 @Gojo.on_message(

Powers/plugins/watchers.py

@@ -1,21 +1,22 @@
+from re import escape as re_escape
 from time import time
-from pyrogram import filters
 from traceback import format_exc
+
+from pyrogram import filters
+from pyrogram.errors import ChatAdminRequired, RPCError, UserAdminInvalid
+from pyrogram.types import ChatPermissions, Message
+
+from Powers import LOGGER, MESSAGE_DUMP, SUPPORT_STAFF
 from Powers.bot_class import Gojo
-from re import escape as re_escape
-from Powers.database.pins_db import Pins
-from Powers.utils.parser import mention_html
+from Powers.database.antispam_db import ANTISPAM_BANNED, GBan
 from Powers.database.approve_db import Approve
 from Powers.database.blacklist_db import Blacklist
-from Powers.utils.regex_utils import regex_searcher
-from pyrogram.types import Message, ChatPermissions
-from Powers import LOGGER, MESSAGE_DUMP, SUPPORT_STAFF
-from Powers.database.warns_db import Warns, WarnSettings
 from Powers.database.group_blacklist import BLACKLIST_CHATS
-from Powers.database.antispam_db import ANTISPAM_BANNED, GBan
+from Powers.database.pins_db import Pins
+from Powers.database.warns_db import Warns, WarnSettings
 from Powers.utils.caching import ADMIN_CACHE, admin_cache_reload
-from pyrogram.errors import RPCError, UserAdminInvalid, ChatAdminRequired
-
+from Powers.utils.parser import mention_html
+from Powers.utils.regex_utils import regex_searcher
 
 # Initialise
 gban_db = GBan()

Powers/utils/admin_check.py

@@ -1,8 +1,9 @@
 from traceback import format_exc
-from pyrogram.types import Message, CallbackQuery
+
 from pyrogram.enums import ChatMemberStatus as CMS
-from Powers import LOGGER, OWNER_ID, DEV_USERS, SUDO_USERS
+from pyrogram.types import CallbackQuery, Message
 
+from Powers import DEV_USERS, LOGGER, OWNER_ID, SUDO_USERS
 
 SUDO_LEVEL = SUDO_USERS + DEV_USERS + [int(OWNER_ID)]
 DEV_LEVEL = DEV_USERS + [int(OWNER_ID)]

Powers/utils/caching.py

@@ -1,12 +1,13 @@
-from typing import List
-from Powers import LOGGER
 from threading import RLock
+from time import perf_counter, time
+from typing import List
+
 from cachetools import TTLCache
-from time import time, perf_counter
-from pyrogram.types import CallbackQuery
 from pyrogram.enums import ChatMembersFilter
+from pyrogram.types import CallbackQuery
 from pyrogram.types.messages_and_media.message import Message
 
+from Powers import LOGGER
 
 THREAD_LOCK = RLock()
 

Powers/utils/custom_filters.py

@@ -1,15 +1,18 @@
+from re import compile as compile_re
+from re import escape
 from shlex import split
-from Powers.vars import Config
 from typing import List, Union
+
+from pyrogram.enums import ChatMemberStatus as CMS
+from pyrogram.enums import ChatType
+from pyrogram.errors import RPCError, UserNotParticipant
 from pyrogram.filters import create
-from re import escape, compile as compile_re
+from pyrogram.types import CallbackQuery, Message
+
+from Powers import DEV_USERS, OWNER_ID, SUDO_USERS
 from Powers.database.disable_db import Disabling
-from pyrogram.types import Message, CallbackQuery
-from Powers import OWNER_ID, DEV_USERS, SUDO_USERS
-from pyrogram.errors import RPCError, UserNotParticipant
-from pyrogram.enums import ChatType, ChatMemberStatus as CMS
 from Powers.utils.caching import ADMIN_CACHE, admin_cache_reload
-
+from Powers.vars import Config
 
 SUDO_LEVEL = set(SUDO_USERS + DEV_USERS + [int(OWNER_ID)])
 DEV_LEVEL = set(DEV_USERS + [int(OWNER_ID)])

Powers/utils/extract_user.py

@@ -1,10 +1,12 @@
+from traceback import format_exc
 from typing import Tuple
+
+from pyrogram.enums import MessageEntityType as entity
+from pyrogram.types.messages_and_media.message import Message
+
 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
 
 
 async def extract_user(c: Gojo, m: Message) -> Tuple[int, str, str]: