Sorted imports....

Powers/__init__.py

@@ -1,11 +1,11 @@
-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 os import path, mkdir, environ
+from sys import exit as sysexit, stdout, version_info
+from time import time
+from traceback import format_exc
 
 
 LOG_DATETIME = datetime.now().strftime("%d_%m_%Y-%H_%M_%S")

Powers/bot_class.py

@@ -1,15 +1,17 @@
-from threading import RLock
-from Powers.vars import Config
 from aiohttp import ClientSession
-from pyrogram.raw.all import layer
-from Powers.database import MongoDB
 from platform import python_version
-from Powers.plugins import all_plugins
+from threading import RLock
 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.database import MongoDB
+from Powers.plugins import all_plugins
+from pyrogram.raw.all import layer
+from Powers.vars import Config
 
 
 INITIAL_LOCK = RLock()

Powers/database/__init__.py

@@ -1,6 +1,7 @@
-from sys import exit as exiter
 from pymongo import MongoClient
 from pymongo.errors import PyMongoError
+from sys import exit as exiter
+
 from Powers import DB_URI, LOGGER, DB_NAME
 
 

Powers/database/antispam_db.py

@@ -1,5 +1,6 @@
-from threading import RLock
 from datetime import datetime
+from threading import RLock
+
 from Powers.database import MongoDB
 
 

Powers/database/approve_db.py

@@ -1,5 +1,6 @@
-from Powers import LOGGER
 from threading import RLock
+
+from Powers import LOGGER
 from Powers.database import MongoDB
 
 

Powers/database/blacklist_db.py

@@ -1,6 +1,7 @@
+from threading import RLock
 from time import time
+
 from Powers import LOGGER
-from threading import RLock
 from Powers.database import MongoDB
 
 

Powers/database/chats_db.py

@@ -1,6 +1,7 @@
+from threading import RLock
 from time import time
+
 from Powers import LOGGER
-from threading import RLock
 from Powers.database import MongoDB
 
 

Powers/database/disable_db.py

@@ -1,6 +1,7 @@
+from threading import RLock
 from time import time
+
 from Powers import LOGGER
-from threading import RLock
 from Powers.database import MongoDB
 
 

Powers/database/filters_db.py

@@ -1,4 +1,5 @@
 from threading import RLock
+
 from Powers.database import MongoDB
 from Powers.utils.msg_types import Types
 

Powers/database/greetings_db.py

@@ -1,5 +1,6 @@
-from Powers import LOGGER
 from threading import RLock
+
+from Powers import LOGGER
 from Powers.database import MongoDB
 
 

Powers/database/group_blacklist.py

@@ -1,4 +1,5 @@
 from threading import RLock
+
 from Powers.database import MongoDB
 from Powers.database.chats_db import Chats
 

Powers/database/notes_db.py

@@ -1,6 +1,7 @@
-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
 

Powers/database/pins_db.py

@@ -1,5 +1,6 @@
-from Powers import LOGGER
 from threading import RLock
+
+from Powers import LOGGER
 from Powers.database import MongoDB
 
 

Powers/database/reporting_db.py

@@ -1,6 +1,7 @@
+from threading import RLock
 from time import time
+
 from Powers import LOGGER
-from threading import RLock
 from Powers.database import MongoDB
 
 

Powers/database/rules_db.py

@@ -1,6 +1,7 @@
+from threading import RLock
 from time import time
+
 from Powers import LOGGER
-from threading import RLock
 from Powers.database import MongoDB
 
 

Powers/database/users_db.py

@@ -1,6 +1,7 @@
+from threading import RLock
 from time import time
+
 from Powers import LOGGER
-from threading import RLock
 from Powers.database import MongoDB
 
 

Powers/database/warns_db.py

@@ -1,6 +1,7 @@
+from threading import RLock
 from time import time
+
 from Powers import LOGGER
-from threading import RLock
 from Powers.database import MongoDB
 
 

Powers/plugins/admin.py

@@ -1,24 +1,26 @@
-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.errors import (
+    RPCError, FloodWait, RightForbidden, UserAdminInvalid, ChatAdminRequired,
+    ChatAdminInviteRequired)
+
+from Powers import LOGGER, OWNER_ID, DEV_USERS, SUPPORT_GROUP, SUPPORT_STAFF        
 from Powers.bot_class import Gojo
 from pyrogram.types import Message
-from Powers.utils.chat_type import chattype
-from Powers.utils.parser import mention_html
+from Powers.vars import Config  
 from Powers.database.approve_db import Approve
 from Powers.database.reporting_db import Reporting
-from Powers.utils.extract_user import extract_user
-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.chat_type import chattype
 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.extract_user import extract_user
+from Powers.utils.parser import mention_html
 
 
 @Gojo.on_message(command("adminlist"))

Powers/plugins/antispam.py

@@ -1,17 +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.types import Message
-from Powers.database.users_db import Users
+from pyrogram.errors import PeerIdInvalid, UserIsBlocked, MessageTooLong
+
+from Powers import LOGGER, MESSAGE_DUMP, SUPPORT_GROUP, SUPPORT_STAFF
+from Powers.bot_class import Gojo
+from Powers.vars import Config
 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
 
 
 # Initialize

Powers/plugins/approve.py

@@ -1,13 +1,14 @@
 from pyrogram import filters
-from Powers.bot_class import Gojo
-from Powers.utils.kbhelpers import ikb
+from pyrogram.errors import RPCError, PeerIdInvalid, UserNotParticipant
+from pyrogram.types import Message, CallbackQuery
+
 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 Powers.utils.extract_user import extract_user
-from pyrogram.types import Message, CallbackQuery, ChatPermissions
-from pyrogram.errors import RPCError, PeerIdInvalid, UserNotParticipant
 from Powers.utils.custom_filters import command, admin_filter, owner_filter
+from Powers.utils.extract_user import extract_user
+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,25 +1,25 @@
 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.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 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 import enums
 from pyrogram.errors import (
     RPCError, PeerIdInvalid, RightForbidden, UserAdminInvalid,
     ChatAdminRequired)
+from pyrogram.filters import regex 
+from pyrogram.types import (
+    Message, CallbackQuery, InlineKeyboardButton, InlineKeyboardMarkup)
+
+from Powers import LOGGER, OWNER_ID, SUPPORT_GROUP, SUPPORT_STAFF
+from Powers.bot_class import Gojo
+from Powers.vars import Config
+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 BAN_GIFS, KICK_GIFS
+from Powers.utils.parser import mention_html
+from Powers.utils.string import extract_time
 
 
-BAN_MEDIA = choice(BAN_GIFS)
-KICK_MEDIA = choice(KICK_GIFS)
 
 
 @Gojo.on_message(command("tban") & restrict_filter)
@@ -105,7 +105,7 @@ async def tban_usr(c: Gojo, m: Message):
         )
         await m.reply_animation(
             reply_to_message_id=r_id,
-            animation=BAN_MEDIA,
+            animation=choice(BAN_GIFS),
             caption=txt,
             reply_markup=keyboard,
             parse_mode=enums.ParseMode.HTML,
@@ -306,7 +306,7 @@ async def dtban_usr(c: Gojo, m: Message):
         )
         await c.send_animation(
             chat_id=m.chat.id,
-            animation=BAN_MEDIA,
+            animation=choice(BAN_GIFS),
             caption=txt,
             reply_markup=keyboard,
             parse_mode=enums.ParseMode.HTML,
@@ -393,7 +393,7 @@ async def kick_usr(c: Gojo, m: Message):
         # await m.reply_text(txt, reply_to_message_id=r_id)
         await m.reply_animation(
             reply_to_message_id=r_id,
-            animation=KICK_MEDIA,
+            animation=choice(KICK_GIFS),
             caption=txt,
             parse_mode=enums.ParseMode.HTML,
         )
@@ -541,7 +541,7 @@ async def dkick_usr(c: Gojo, m: Message):
         await c.send_message(m.chat.id, txt)
         await c.send_animation(
             chat_id=m.chat.id,
-            animation=KICK_MEDIA,
+            animation=choice(KICK_GIFS),
             caption=txt,
             parse_mode=enums.ParseMode.HTML,
         )
@@ -758,7 +758,7 @@ async def dban_usr(c: Gojo, m: Message):
             ],
         )
         await c.send_animation(
-            m.chat.id, animation=BAN_MEDIA, caption=txt, reply_markup=keyboard
+            m.chat.id, animation=choice(BAN_GIFS), caption=txt, reply_markup=keyboard
         )
     except ChatAdminRequired:
         await m.reply_text(text="I'm not admin or I don't have rights.")
@@ -855,7 +855,7 @@ async def ban_usr(c: Gojo, m: Message):
             ],
         )
         await m.reply_animation(
-            animation=BAN_MEDIA,
+            animation=choice(BAN_GIFS),
             caption=txt,
             reply_markup=keyboard,
             reply_to_message_id=r_id,
@@ -917,7 +917,7 @@ async def kickme(_, m: Message):
         await m.chat.ban_member(m.from_user.id)
         txt = "Why not let me help you!"
         txt += f"\n<b>Reason</b>: {reason}" if reason else ""
-        await m.reply_animation(animation=KICK_MEDIA, caption=txt)
+        await m.reply_animation(animation=choice(KICK_GIFS), caption=txt)
         await m.chat.unban_member(m.from_user.id)
     except RPCError as ef:
         await m.reply_text(

Powers/plugins/blacklist.py

@@ -1,11 +1,13 @@
 from html import escape
-from Powers import LOGGER
+
 from pyrogram import filters
-from Powers.bot_class import Gojo
-from Powers.utils.kbhelpers import ikb
 from pyrogram.types import Message, CallbackQuery
+
+from Powers import LOGGER
+from Powers.bot_class import Gojo
 from Powers.database.blacklist_db import Blacklist
 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 Powers.utils.custom_filters import command
+from pyrogram.types import Message
+
 from Powers import LOGGER, OWNER_ID, DEV_USERS, SUDO_USERS, WHITELIST_USERS
+from Powers.bot_class import Gojo
+from Powers.utils.custom_filters import command
+from Powers.utils.parser import mention_html
 
 
 @Gojo.on_message(command("botstaff", dev_cmd=True))

Powers/plugins/chat_blacklist.py

@@ -1,10 +1,12 @@
-from Powers import LOGGER
 from traceback import format_exc
-from Powers.bot_class import Gojo
-from pyrogram.types import Message
-from Powers.utils.custom_filters import command
+
 from pyrogram.errors import RPCError, PeerIdInvalid
+from pyrogram.types import Message
+
+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

Powers/plugins/dev.py

@@ -1,19 +1,21 @@
-import sys
+from asyncio import sleep, subprocess, create_subprocess_shell
 from io import BytesIO, StringIO
+import sys
+from time import time, gmtime, strftime
 from traceback import format_exc
+
+from pyrogram.errors import (
+    RPCError, FloodWait, PeerIdInvalid, ChannelInvalid, ChannelPrivate,
+    MessageTooLong, ChatAdminRequired)
+from pyrogram.types import Message   
+
+from Powers import LOGGER, UPTIME, LOGFILE, MESSAGE_DUMP 
 from Powers.bot_class import Gojo
-from pyrogram.types import Message
-from Powers.utils.http_helper import *
-from time import time, gmtime, strftime
 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)
 
 
 @Gojo.on_message(command("ping", sudo_cmd=True))

Powers/plugins/disable.py

@@ -1,10 +1,12 @@
 from html import escape
+
 from pyrogram import filters
-from Powers.bot_class import Gojo
-from Powers import LOGGER, HELP_COMMANDS
-from Powers.database.disable_db import Disabling
 from pyrogram.types import (
     Message, CallbackQuery, InlineKeyboardButton, InlineKeyboardMarkup)
+
+from Powers import LOGGER, HELP_COMMANDS    
+from Powers.bot_class import Gojo
+from Powers.database.disable_db import Disabling
 from Powers.utils.custom_filters import (
     command, admin_filter, owner_filter, can_change_filter)
 

Powers/plugins/filters.py

@@ -1,16 +1,18 @@
+from re import escape as re_escape
 from secrets import choice
 from traceback import format_exc
-from re import escape as re_escape
-from pyrogram import enums, filters
+
+from pyrogram import filters
 from pyrogram.errors import RPCError
-from Powers.utils.kbhelpers import ikb
+from pyrogram.types import Message, CallbackQuery, InlineKeyboardMarkup
+
 from Powers.bot_class import LOGGER, Gojo
 from Powers.utils.cmd_senders import send_cmd
+from Powers.utils.kbhelpers import ikb
 from Powers.database.filters_db import Filters
-from Powers.utils.regex_utils import regex_searcher
-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.msg_types import Types, get_filter_type
+from Powers.utils.regex_utils import regex_searcher
 from Powers.utils.string import (
     parse_button, split_quotes, build_keyboard,
     escape_mentions_using_curly_brackets)

Powers/plugins/formatting.py

@@ -1,10 +1,10 @@
-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 import LOGGER
+from Powers.bot_class import Gojo
+from Powers.utils.custom_filters import command
+from Powers.utils.kbhelpers import ikb
 
 async def gen_formatting_kb(m):
     return ikb(

Powers/plugins/fun.py

@@ -1,11 +1,13 @@
 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.errors import MessageTooLong
 from pyrogram.types import Message
+
 from Powers import LOGGER, DEV_USERS
-from pyrogram.errors import MessageTooLong
+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

Powers/plugins/greetings.py

@@ -1,17 +1,19 @@
 from html import escape
 from secrets import choice
+
+from pyrogram import enums, filters
+from pyrogram.errors import RPCError, ChatAdminRequired
+from pyrogram.types import Message, ChatMemberUpdated, InlineKeyboardMarkup
+
 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.vars import Config
 from Powers.database.antispam_db import GBan
 from Powers.database.greetings_db import Greetings
+from Powers.utils.chat_type import chattype
+from Powers.utils.custom_filters import command, admin_filter, bot_admin_filter
 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)
 

Powers/plugins/info.py

@@ -1,15 +1,17 @@
-import os
-from pyrogram import enums
 from datetime import datetime
+import os
 from traceback import format_exc
-from Powers.bot_class import Gojo
+
+from pyrogram import enums
 from pyrogram.types import Message
-from Powers.utils.chat_type import c_type
+
+from Powers import (
+    LOGGER, DEV_USERS, SUDO_USERS, SUPPORT_STAFF, WHITELIST_USERS)
+from Powers.bot_class import Gojo
 from Powers.database.antispam_db import GBan
+from Powers.utils.chat_type import c_type
 from Powers.utils.custom_filters import command
 from Powers.utils.extract_user import extract_user
-from Powers import (
-    LOGGER, DEV_USERS, SUDO_USERS, SUPPORT_STAFF, WHITELIST_USERS)
 
 
 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 RPCError, ChatNotModified, ChatAdminRequired
+from pyrogram.types import Message, ChatPermissions
+
+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,22 +1,21 @@
 from random import choice
-from Powers.vars import Config
-from Powers.bot_class import Gojo
-from pyrogram.filters import regex
-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.filters import regex
 from pyrogram.types import (
     Message, CallbackQuery, ChatPermissions, InlineKeyboardButton,
     InlineKeyboardMarkup)
 
-
-MUTE_MEDIA = choice(MUTE_GIFS)
+from Powers import LOGGER, OWNER_ID, SUPPORT_GROUP, SUPPORT_STAFF
+from Powers.bot_class import Gojo
+from Powers.vars import Config
+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
 
 
 @Gojo.on_message(command("tmute") & restrict_filter)
@@ -102,7 +101,7 @@ async def tmute_usr(c: Gojo, m: Message):
             ],
         )
         await m.reply_animation(
-            animation=MUTE_MEDIA,
+            animation=choice(MUTE_GIFS),
             caption=txt,
             reply_markup=keyboard,
             reply_to_message_id=r_id,
@@ -207,7 +206,7 @@ async def dtmute_usr(c: Gojo, m: Message):
             ],
         )
         await c.send_animation(
-            animation=MUTE_MEDIA,
+            animation=choice(MUTE_GIFS),
             chat_id=m.chat.id,
             caption=txt,
             reply_markup=keyboard,
@@ -381,7 +380,7 @@ async def mute_usr(c: Gojo, m: Message):
             ],
         )
         await m.reply_animation(
-            animation=MUTE_MEDIA,
+            animation=choice(MUTE_GIFS),
             caption=txt,
             reply_markup=keyboard,
             reply_to_message_id=r_id,
@@ -533,7 +532,7 @@ async def dmute_usr(c: Gojo, m: Message):
             ],
         )
         await c.send_animation(
-            animation=MUTE_MEDIA, chat_id=m.chat.id, caption=txt, reply_markup=keyboard
+            animation=choice(MUTE_GIFS), chat_id=m.chat.id, caption=txt, reply_markup=keyboard
         )
     except ChatAdminRequired:
         await m.reply_text(text="I'm not admin or I don't have rights.")

Powers/plugins/notes.py

@@ -1,16 +1,18 @@
-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.errors import RPCError
-from Powers.utils.kbhelpers import ikb
-from Powers.utils.cmd_senders import send_cmd
-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 import LOGGER
+from Powers.vars import Config
+from Powers.bot_class import Gojo
+from Powers.database.notes_db import Notes, NotesSettings
+from Powers.utils.cmd_senders import send_cmd
 from Powers.utils.custom_filters import command, admin_filter, owner_filter
+from Powers.utils.kbhelpers import ikb
+from Powers.utils.msg_types import Types, get_note_type
 from Powers.utils.string import (
     parse_button, build_keyboard, escape_mentions_using_curly_brackets)
 

Powers/plugins/pin.py

@@ -1,13 +1,15 @@
-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.filters import regex
+from pyrogram.errors import RPCError, RightForbidden, ChatAdminRequired
+from pyrogram.types import Message, CallbackQuery
+
 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 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.kbhelpers import ikb
+from Powers.utils.string import parse_button, build_keyboard
 
 
 @Gojo.on_message(command("pin") & admin_filter)

Powers/plugins/purge.py

@@ -1,9 +1,11 @@
 from asyncio import sleep
+
+from pyrogram.types import Message
+from pyrogram.errors import RPCError, MessageDeleteForbidden
+
 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.errors import RPCError, MessageDeleteForbidden
 from Powers.utils.custom_filters import command, admin_filter
 
 
@@ -62,7 +64,7 @@ async def spurge(c: Gojo, m: Message):
         return
 
     if m.reply_to_message:
-        message_ids = list(range(m.reply_to_message.message_id, m.message_id))
+        message_ids = list(range(m.reply_to_message.id, m.id))
 
         def divide_chunks(l: list, n: int = 100):
             for i in range(0, len(l), n):

Powers/plugins/report.py

@@ -1,15 +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.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 import LOGGER, SUPPORT_STAFF
+from Powers.bot_class import Gojo
 from Powers.database.reporting_db import Reporting
-from pyrogram.enums import ChatMembersFilter as cmf
+from Powers.utils.chat_type import chattype
 from Powers.utils.custom_filters import command, admin_filter
+from Powers.utils.kbhelpers import ikb
+from Powers.utils.parser import mention_html
 
 
 @Gojo.on_message(

Powers/plugins/rules.py

@@ -1,11 +1,13 @@
 from Powers import LOGGER
+
 from pyrogram import filters
+from pyrogram.types import Message, CallbackQuery
+
 from Powers.vars import Config
 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.kbhelpers import ikb
 
 
 @Gojo.on_message(command("rules") & filters.group)

Powers/plugins/start.py

@@ -1,14 +1,16 @@
 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 pyrogram.types import Message, CallbackQuery
+from pyrogram.errors import UserIsBlocked, QueryIdInvalid, MessageNotModified
+
 from Powers import LOGGER, HELP_COMMANDS
-from Powers.utils.extras import StartPic
+from Powers.bot_class import Gojo
+from Powers.vars import Config
 from Powers.utils.chat_type import chattype
 from Powers.utils.custom_filters import command
-from pyrogram.types import Message, CallbackQuery
-from pyrogram.errors import UserIsBlocked, QueryIdInvalid, MessageNotModified
+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)

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.database.blacklist_db import Blacklist
+from Powers.database.chats_db import Chats
 from Powers.utils.custom_filters import command
 from Powers.database.disable_db import Disabling
-from Powers.database.blacklist_db import Blacklist
+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
 
 
 @Gojo.on_message(command("stats", dev_cmd=True))

Powers/plugins/utils.py

@@ -1,26 +1,28 @@
-import re
 import aiofiles
-from Powers import *
-from os import remove
+from aiohttp import ClientSession
+from gpytranslate import Translator
 from io import BytesIO
+from os import remove
+import re
+from search_engine_parser import GoogleSearch
 from tswift import Song
-from wikipedia import summary
 from traceback import format_exc
-from Powers.bot_class import Gojo
-from aiohttp import ClientSession
-from gpytranslate import Translator
+from wikipedia import summary
+from wikipedia.exceptions import PageError, DisambiguationError
+
 from pyrogram import enums, filters
-from Powers.utils.http_helper import *
+from pyrogram.errors import PeerIdInvalid, MessageTooLong
+from pyrogram.types import Message, InlineKeyboardButton, InlineKeyboardMarkup
+
+from Powers import *
+from Powers.bot_class import Gojo
 from Powers.database.users_db import Users
 from Powers.utils.chat_type import chattype
-from Powers.utils.parser import mention_html
-from search_engine_parser import GoogleSearch
+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 pyrogram.errors import PeerIdInvalid, MessageTooLong
-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.http_helper import *
+from Powers.utils.parser import mention_html
 
 
 @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 (
+    Message, CallbackQuery, ChatPermissions, InlineKeyboardButton,
+    InlineKeyboardMarkup)
+
 from Powers import LOGGER, SUPPORT_STAFF
+from Powers.bot_class import Gojo
+from Powers.vars import Config
 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.extract_user import extract_user
+from Powers.utils.parser import mention_html
+from Powers.database.warns_db import Warns, WarnSettings
 
 
 @Gojo.on_message(

Powers/plugins/watchers.py

@@ -1,20 +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 RPCError, UserAdminInvalid, ChatAdminRequired
+from pyrogram.types import Message, ChatPermissions
+
+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

Powers/utils/admin_check.py

@@ -1,5 +1,7 @@
 from traceback import format_exc
+
 from pyrogram.types import Message, CallbackQuery
+
 from Powers import LOGGER, OWNER_ID, DEV_USERS, SUDO_USERS
 
 

Powers/utils/caching.py

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

Powers/utils/chat_type.py

@@ -1,6 +1,7 @@
-from Powers.bot_class import Gojo
-from pyrogram.types import Message
 from pyrogram.enums import ChatType
+from pyrogram.types import Message
+
+from Powers.bot_class import Gojo
 
 
 async def chattype(m: Message):

Powers/utils/custom_filters.py

@@ -1,15 +1,17 @@
+from re import escape, compile as compile_re
 from shlex import split
-from pyrogram import enums
-from Powers.vars import Config
 from typing import List, Union
+
+from pyrogram import enums
+from pyrogram.errors import RPCError, UserNotParticipant
 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.errors import RPCError, UserNotParticipant
+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)])

Powers/utils/extract_user.py

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

Powers/utils/msg_types.py

@@ -1,4 +1,5 @@
 from enum import IntEnum, unique
+
 from pyrogram.types import Message