optimizing code

Author: rking32

assistant/__init__.py

@@ -6,7 +6,7 @@
 #
 # All rights reserved.
 
-from .logger import logging  #noqa
-from .config import Config  #noqa
-from .bot import bot  #noqa
-from . import filters  #noqa
+from .logger import logging  # noqa
+from .config import Config  # noqa
+from .bot import bot  # noqa
+from . import filters  # noqa

assistant/bot.py

@@ -6,13 +6,15 @@
 #
 # All rights reserved.
 
+__all__ = ["bot", "START_TIME"]
+
 import time
 
 from pyrogram import Client
 
 from . import Config, logging
 
-LOG = logging.getLogger(__name__)
+_LOG = logging.getLogger(__name__)
 START_TIME = time.time()
 
 bot = Client(":memory:",
@@ -21,4 +23,4 @@
              bot_token=Config.BOT_TOKEN,
              plugins={'root': "assistant.plugins"})
 
-LOG.info("assistant-bot initialized!")
+_LOG.info("assistant-bot initialized!")

assistant/config.py

@@ -6,16 +6,18 @@
 #
 # All rights reserved.
 
+__all__ = ["Config"]
+
 import os
 
-from pyrogram import Filters
 from dotenv import load_dotenv
 
 if os.path.isfile("config.env"):
     load_dotenv("config.env")
 
 
 class Config:
+    """ assistant configs """
     APP_ID = int(os.environ.get("APP_ID", 0))
     API_HASH = os.environ.get("API_HASH")
     BOT_TOKEN = os.environ.get("BOT_TOKEN")

assistant/filters.py

@@ -6,7 +6,7 @@
 #
 # All rights reserved.
 
-__all__ = ["auth_chats", "is_admin"]
+__all__ = ["auth_chats", "auth_users"]
 
 import asyncio
 
@@ -19,7 +19,7 @@
 
 
 async def _is_admin_or_dev(_, msg: Message) -> bool:
-    global _FETCHING
+    global _FETCHING  # pylint: disable=global-statement
     if msg.chat.id not in Config.AUTH_CHATS:
         return False
     if not msg.from_user:
@@ -32,16 +32,17 @@ async def _is_admin_or_dev(_, msg: Message) -> bool:
     if msg.chat.id not in Config.ADMINS:
         _FETCHING = True
         admins = []
-        _LOG.info(f"fetching data from [{msg.chat.id}] ...")
+        _LOG.info("fetching data from [%s] ...", msg.chat.id)
+        # pylint: disable=protected-access
         async for c_m in msg._client.iter_chat_members(msg.chat.id):
             if c_m.status in ("creator", "administrator"):
                 admins.append(c_m.user.id)
         Config.ADMINS[msg.chat.id] = tuple(admins)
-        _LOG.info(f"data fetched from [{msg.chat.id}] !")
+        _LOG.info("data fetched from [%s] !", msg.chat.id)
         del admins
         _FETCHING = False
     return msg.from_user.id in Config.ADMINS[msg.chat.id]
 
 
-auth_chats = Filters.chat(list(Config.AUTH_CHATS)) 
+auth_chats = Filters.chat(list(Config.AUTH_CHATS))
 auth_users = Filters.create(_is_admin_or_dev)

assistant/logger.py

@@ -6,6 +6,8 @@
 #
 # All rights reserved.
 
+__all__ = ["logging"]
+
 import logging
 
 # enable logging

assistant/plugins/__init__.py

@@ -4,4 +4,4 @@
 # and is released under the "GNU v3.0 License Agreement".
 # Please see < https://github.com/Userge-Assistant/blob/master/LICENSE >
 #
-# All rights reserved.
+# All rights reserved.

assistant/plugins/alive.py

@@ -23,20 +23,14 @@
 
 @bot.on_message(Filters.command("alive") & filters.auth_chats)
 async def _alive(_, message: Message):
-
-    output = f"""
-**🤖 Bot Uptime** : `{time_formatter(time.time() - START_TIME)}`
-**🤖 Bot Version** : `{versions.__assistant_version__}`
-**️️⭐ Python** : `{versions.__python_version__}`
-**💥 Pyrogram** : `{versions.__pyro_version__}` """
     try:
-        await sendit(message.chat.id, output)
+        await _sendit(message.chat.id)
     except (FileIdInvalid, FileReferenceEmpty, BadRequest):
-        await refresh_data()
-        await sendit(message.chat.id, output)
+        await _refresh_data()
+        await _sendit(message.chat.id)
 
 
-async def refresh_data():
+async def _refresh_data():
     LOGO_DATA.clear()
     for msg in await bot.get_messages('UserGeOt', MSG_IDS):
         if not msg.animation:
@@ -45,9 +39,14 @@ async def refresh_data():
         LOGO_DATA.append((gif.file_id, gif.file_ref))
 
 
-async def sendit(chat_id, caption):
+async def _sendit(chat_id):
     if not LOGO_DATA:
-        await refresh_data()
+        await _refresh_data()
+    caption = f"""
+**🤖 Bot Uptime** : `{time_formatter(time.time() - START_TIME)}`
+**🤖 Bot Version** : `{versions.__assistant_version__}`
+**️️⭐ Python** : `{versions.__python_version__}`
+**💥 Pyrogram** : `{versions.__pyro_version__}` """
     button = InlineKeyboardMarkup(
         [
             [

assistant/plugins/antiflood.py

@@ -20,7 +20,7 @@
 
 @bot.on_message(
     Filters.incoming & ~Filters.edited & filters.auth_chats & ~filters.auth_users, group=1)
-async def flood(_, message: Message):
+async def _flood(_, message: Message):
     chat_flood = DATA.get(message.chat.id)
     if chat_flood is None:
         data = {

assistant/plugins/paste.py

@@ -129,12 +129,12 @@ async def get_paste_(_, message: Message):
             await msg.edit(f"`Request timed out -> {e_r}`")
         except TooManyRedirects as e_r:
             await msg.edit("`Request exceeded the configured `"
-                          f"`number of maximum redirections -> {e_r}`")
+                           f"`number of maximum redirections -> {e_r}`")
         except ClientResponseError as e_r:
             await msg.edit(f"`Request returned an unsuccessful status code -> {e_r}`")
         else:
             if len(text) > Config.MAX_MSG_LENGTH:
                 await msg.edit("`Content Too Large...`")
             else:
                 await msg.edit("--Fetched Content Successfully!--"
-                              f"\n\n**Content** :\n`{text}`")
+                               f"\n\n**Content** :\n`{text}`")

assistant/plugins/warn.py

@@ -23,7 +23,7 @@
 
 @bot.on_message(
     Filters.command("warn") & filters.auth_chats & filters.auth_users)
-async def warn_user(_, msg: Message):
+async def _warn_user(_, msg: Message):
     global WARN_MODE, WARN_LIMIT  # pylint: disable=global-statement
 
     replied = msg.reply_to_message
@@ -110,7 +110,7 @@ async def warn_user(_, msg: Message):
 
 
 @bot.on_callback_query(Filters.regex(pattern=r"rm_warn\((.+?)\)"))
-async def remove_warn(_, c_q: CallbackQuery):
+async def _remove_warn(_, c_q: CallbackQuery):
     user_id = int(c_q.matches[0].group(1))
     if is_admin(c_q.message.chat.id, c_q.from_user.id, check_devs=True):
         if DATA.get(user_id):
@@ -133,7 +133,7 @@ async def remove_warn(_, c_q: CallbackQuery):
 
 @bot.on_message(
     Filters.command("setwarn") & filters.auth_chats & filters.auth_users)
-async def set_warn_mode_and_limit(_, msg: Message):
+async def _set_warn_mode_and_limit(_, msg: Message):
     global WARN_MODE, WARN_LIMIT  # pylint: disable=global-statement
     cmd = len(msg.text)
     if msg.text and cmd == 8:
@@ -151,7 +151,7 @@ async def set_warn_mode_and_limit(_, msg: Message):
         await msg.reply("`Warning Mode Updated to Mute`")
     elif args[0].isnumeric():
         input_ = int(args[0])
-        if not input_ >= 3:
+        if input_ < 3:
             await msg.reply("`Can't Warn Limit less then 3`")
             return
         WARN_LIMIT = input_
@@ -160,10 +160,9 @@ async def set_warn_mode_and_limit(_, msg: Message):
         await msg.reply("`Invalid arguments, Exiting...`")
 
 
-
 @bot.on_message(
     Filters.command("resetwarn") & filters.auth_chats & filters.auth_users)
-async def reset_all_warns(_, msg: Message):
+async def _reset_all_warns(_, msg: Message):
     replied = msg.reply_to_message
     if not replied:
         return
@@ -185,7 +184,7 @@ async def reset_all_warns(_, msg: Message):
 
 
 @bot.on_message(Filters.command("warns") & filters.auth_chats)
-async def check_warns_of_user(_, msg: Message):
+async def _check_warns_of_user(_, msg: Message):
     global WARN_LIMIT  # pylint: disable=global-statement
     replied = msg.reply_to_message
     if replied:
@@ -220,6 +219,7 @@ async def check_warns_of_user(_, msg: Message):
 
 
 async def sed(msg: Message):
+    """ send default sticker """
     sticker = (await bot.get_messages('UserGeOt', 498697)).sticker
     file_id = sticker.file_id
     fileref = sticker.file_ref