pep8tting whole project, removing unused imports and code

Author: MattiaFailla

tg_bot/__init__.py

@@ -3,6 +3,7 @@
 import sys
 
 import telegram.ext as tg
+
 from tg_bot._version import __version__
 
 # enable logging
@@ -113,7 +114,6 @@
     DEFAULT_CHAT_ID = Config.DEFAULT_CHAT_ID
     VERSION = __version__
 
-
 SUDO_USERS.add(OWNER_ID)
 
 updater = tg.Updater(TOKEN, workers=WORKERS)

tg_bot/__main__.py

@@ -33,9 +33,7 @@
     LOGGER,
     ALLOW_EXCL,
     DEFAULT_CHAT_ID,
-    VERSION,
 )
-
 # needed to dynamically load modules
 # NOTE: Module order is not guaranteed, specify that in the config file!
 from tg_bot.modules import ALL_MODULES
@@ -79,7 +77,6 @@
 In caso tu sia ancora mutato, invia questo comando: /CoCDone per essere sbloccato.\nOra puoi chattare nel gruppo e inviare messaggi :)\nSe hai ancora bisogno di me puoi
 usare il comando /help per più informazioni."""
 
-
 IMPORTED = {}
 MIGRATEABLE = []
 HELPABLE = {}
@@ -348,7 +345,7 @@ def send_settings(chat_id, user_id, user=False):
                 user_id,
                 "Queste sono le tue impostazioni attuali:" + "\n\n" + settings,
                 parse_mode=ParseMode.MARKDOWN,
-                )
+            )
 
         else:
             dispatcher.bot.send_message(

tg_bot/modules/__init__.py

@@ -17,8 +17,8 @@ def __list_all_modules():
         to_load = LOAD
         if to_load:
             if not all(
-                any(mod == module_name for module_name in all_modules)
-                for mod in to_load
+                    any(mod == module_name for module_name in all_modules)
+                    for mod in to_load
             ):
                 LOGGER.error("Invalid loadorder names. Quitting.")
                 quit(1)

tg_bot/modules/admin.py

@@ -153,9 +153,9 @@ def pin(bot: Bot, update: Update, args: List[str]) -> str:
     is_silent = True
     if len(args) >= 1:
         is_silent = not (
-            args[0].lower() == "notify"
-            or args[0].lower() == "loud"
-            or args[0].lower() == "violent"
+                args[0].lower() == "notify"
+                or args[0].lower() == "loud"
+                or args[0].lower() == "violent"
         )
 
     if prev_message and is_group:

tg_bot/modules/afk.py

@@ -55,7 +55,7 @@ def reply_afk(bot: Bot, update: Update):
 
             elif ent.type == MessageEntity.MENTION:
                 user_id = get_user_id(
-                    message.text[ent.offset : ent.offset + ent.length]
+                    message.text[ent.offset: ent.offset + ent.length]
                 )
                 if not user_id:
                     # Should never happen, since for a user to become AFK they must have spoken. Maybe changed username?

tg_bot/modules/disable.py

@@ -22,6 +22,7 @@
     DISABLE_OTHER = []
     ADMIN_CMDS = []
 
+
     class DisableAbleCommandHandler(CommandHandler):
         def __init__(self, command, callback, admin_ok=False, **kwargs):
             super().__init__(command, callback, **kwargs)
@@ -41,8 +42,8 @@ def check_update(self, update):
             if super().check_update(update):
                 # Should be safe since check_update passed.
                 command = update.effective_message.text_html.split(None, 1)[0][
-                    1:
-                ].split("@")[0]
+                          1:
+                          ].split("@")[0]
 
                 # disabled, admincmd, user admin
                 if sql.is_command_disabled(chat.id, command):
@@ -54,6 +55,7 @@ def check_update(self, update):
 
             return False
 
+
     class DisableAbleRegexHandler(RegexHandler):
         def __init__(self, pattern, callback, friendly="", **kwargs):
             super().__init__(pattern, callback, **kwargs)
@@ -66,6 +68,7 @@ def check_update(self, update):
                 chat.id, self.friendly
             )
 
+
     @run_async
     @user_admin
     def disable(bot: Bot, update: Update, args: List[str]):
@@ -89,6 +92,7 @@ def disable(bot: Bot, update: Update, args: List[str]):
         else:
             update.effective_message.reply_text("Cosa dovrei disabilitare?")
 
+
     @run_async
     @user_admin
     def enable(bot: Bot, update: Update, args: List[str]):
@@ -111,6 +115,7 @@ def enable(bot: Bot, update: Update, args: List[str]):
         else:
             update.effective_message.reply_text("Cosa dovrei abilitare?")
 
+
     @run_async
     @user_admin
     def list_cmds(bot: Bot, update: Update):
@@ -125,6 +130,7 @@ def list_cmds(bot: Bot, update: Update):
         else:
             update.effective_message.reply_text("Tutti i comandi sono abilitati.")
 
+
     # do not async
     def build_curr_disabled(chat_id: Union[str, int]) -> str:
         disabled = sql.get_all_disabled(chat_id)
@@ -136,24 +142,29 @@ def build_curr_disabled(chat_id: Union[str, int]) -> str:
             result += " - `{}`\n".format(escape_markdown(cmd))
         return "I seguenti comando sono attualmente ristretti:\n{}".format(result)
 
+
     @run_async
     def commands(bot: Bot, update: Update):
         chat = update.effective_chat
         update.effective_message.reply_text(
             build_curr_disabled(chat.id), parse_mode=ParseMode.MARKDOWN
         )
 
+
     def __stats__():
         return "{} comandi disabilitati, in {} chats.".format(
             sql.num_disabled(), sql.num_chats()
         )
 
+
     def __migrate__(old_chat_id, new_chat_id):
         sql.migrate_chat(old_chat_id, new_chat_id)
 
+
     def __chat_settings__(chat_id, user_id):
         return build_curr_disabled(chat_id)
 
+
     __mod_name__ = "Command disabling"
 
     __help__ = """

tg_bot/modules/global_bans.py

@@ -267,8 +267,8 @@ def check_and_ban(update, user_id, should_message=True):
 def enforce_gban(bot: Bot, update: Update):
     # Not using @restrict handler to avoid spamming - just ignore if cant gban.
     if (
-        sql.does_chat_gban(update.effective_chat.id)
-        and update.effective_chat.get_member(bot.id).can_restrict_members
+            sql.does_chat_gban(update.effective_chat.id)
+            and update.effective_chat.get_member(bot.id).can_restrict_members
     ):
         user = update.effective_user  # type: Optional[User]
         chat = update.effective_chat  # type: Optional[Chat]

tg_bot/modules/helper_funcs/chat_status.py

@@ -12,10 +12,10 @@ def can_delete(chat: Chat, bot_id: int) -> bool:
 
 def is_user_ban_protected(chat: Chat, user_id: int, member: ChatMember = None) -> bool:
     if (
-        chat.type == "private"
-        or user_id in SUDO_USERS
-        or user_id in WHITELIST_USERS
-        or chat.all_members_are_administrators
+            chat.type == "private"
+            or user_id in SUDO_USERS
+            or user_id in WHITELIST_USERS
+            or chat.all_members_are_administrators
     ):
         return True
 
@@ -26,9 +26,9 @@ def is_user_ban_protected(chat: Chat, user_id: int, member: ChatMember = None) -
 
 def is_user_admin(chat: Chat, user_id: int, member: ChatMember = None) -> bool:
     if (
-        chat.type == "private"
-        or user_id in SUDO_USERS
-        or chat.all_members_are_administrators
+            chat.type == "private"
+            or user_id in SUDO_USERS
+            or chat.all_members_are_administrators
     ):
         return True
 

tg_bot/modules/helper_funcs/extraction.py

@@ -23,7 +23,7 @@ def extract_user(message: Message, args: List[str]) -> Optional[int]:
 
 
 def extract_user_and_text(
-    message: Message, args: List[str]
+        message: Message, args: List[str]
 ) -> (Optional[int], Optional[str]):
     prev_message = message.reply_to_message
     split_text = message.text.split(None, 1)
@@ -45,7 +45,7 @@ def extract_user_and_text(
     if entities and ent and ent.offset == len(message.text) - len(text_to_parse):
         ent = entities[0]
         user_id = ent.user.id
-        text = message.text[ent.offset + ent.length :]
+        text = message.text[ent.offset + ent.length:]
 
     elif len(args) >= 1 and args[0][0] == "@":
         user = args[0]
@@ -94,7 +94,7 @@ def extract_user_and_text(
 
 def extract_text(message) -> str:
     return (
-        message.text
-        or message.caption
-        or (message.sticker.emoji if message.sticker else None)
+            message.text
+            or message.caption
+            or (message.sticker.emoji if message.sticker else None)
     )

tg_bot/modules/helper_funcs/handlers.py

@@ -12,14 +12,14 @@ def __init__(self, command, callback, **kwargs):
 
     def check_update(self, update):
         if isinstance(update, Update) and (
-            update.message or update.edited_message and self.allow_edited
+                update.message or update.edited_message and self.allow_edited
         ):
             message = update.message or update.edited_message
 
             if message.text and len(message.text) > 1:
                 fst_word = message.text_html.split(None, 1)[0]
                 if len(fst_word) > 1 and any(
-                    fst_word.startswith(start) for start in CMD_STARTERS
+                        fst_word.startswith(start) for start in CMD_STARTERS
                 ):
                     command = fst_word[1:].split("@")
                     command.append(
@@ -33,8 +33,8 @@ def check_update(self, update):
                         res = self.filters(message)
 
                     return res and (
-                        command[0].lower() in self.command
-                        and command[1].lower() == message.bot.username.lower()
+                            command[0].lower() in self.command
+                            and command[1].lower() == message.bot.username.lower()
                     )
 
             return False