Sourcery refactored main branch #6
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![sourcery-ai[bot]](https://avatars.githubusercontent.com/in/48477?s=60&v=4){kind=small}
| if ALLOW_EXCL: | ||
| CMD_STARTERS = ('/', '!') | ||
| else: | ||
| CMD_STARTERS = ('/') | ||
|
|
||
| CMD_STARTERS = ('/', '!') if ALLOW_EXCL else '/' |
There was a problem hiding this comment.
Lines 13-17 refactored with the following changes:
- Replace if statement with if expression (
assign-if-exp)
Comment on lines
-35
to
+44
| if chat.get_member(bot.id).can_delete_messages: | ||
| if sql.is_enabled(chat.id): | ||
| fst_word = message.text.strip().split(None, 1)[0] | ||
| if chat.get_member(bot.id).can_delete_messages and sql.is_enabled(chat.id): | ||
| fst_word = message.text.strip().split(None, 1)[0] | ||
|
|
||
| if len(fst_word) > 1 and any(fst_word.startswith(start) for start in CMD_STARTERS): | ||
| if len(fst_word) > 1 and any(fst_word.startswith(start) for start in CMD_STARTERS): | ||
|
|
||
| command = fst_word[1:].split('@') | ||
| chat = update.effective_chat | ||
| command = fst_word[1:].split('@') | ||
| chat = update.effective_chat | ||
|
|
||
| ignored = sql.is_command_ignored(chat.id, command[0]) | ||
| if ignored: | ||
| return | ||
| ignored = sql.is_command_ignored(chat.id, command[0]) | ||
| if ignored: | ||
| return | ||
|
|
||
| if command[0] not in command_list: | ||
| message.delete() | ||
| if command[0] not in command_list: | ||
| message.delete() |
There was a problem hiding this comment.
Function clean_blue_text_must_click refactored with the following changes:
- Merge nested if conditions (
merge-nested-ifs)
Comment on lines
-61
to
+63
| if len(args) >= 1: | ||
| if args: | ||
| val = args[0].lower() | ||
| if val == "off" or val == "no": | ||
| if val in ["off", "no"]: | ||
| sql.set_cleanbt(chat.id, False) | ||
| reply = "Bluetext cleaning has been disabled for <b>{}</b>".format(html.escape(chat.title)) | ||
| message.reply_text(reply, parse_mode=ParseMode.HTML) | ||
|
|
||
| elif val == "yes" or val == "on": | ||
| elif val in ["yes", "on"]: |
There was a problem hiding this comment.
Function set_blue_text_must_click refactored with the following changes:
- Replace if statement with if expression (
assign-if-exp) - Replace multiple comparisons of same variable with
inoperator (merge-comparisons) - Simplify sequence comparison (
simplify-len-comparison)
Comment on lines
-93
to
+85
| if len(args) >= 1: | ||
| if args: |
There was a problem hiding this comment.
Function add_bluetext_ignore refactored with the following changes:
- Simplify sequence comparison (
simplify-len-comparison)
Comment on lines
-114
to
+106
| if len(args) >= 1: | ||
| if args: |
There was a problem hiding this comment.
Function remove_bluetext_ignore refactored with the following changes:
- Simplify sequence comparison (
simplify-len-comparison)
Comment on lines
-60
to
+68
| if param == "on" or param == "true": | ||
| if param in ["on", "true"]: | ||
| sql.set_cas_autoban(chat.id, True) | ||
| msg.reply_text("Successfully updated configuration.") | ||
| return | ||
| elif param == "off" or param == "false": | ||
| elif param in ["off", "false"]: | ||
| sql.set_cas_autoban(chat.id, False) | ||
| msg.reply_text("Successfully updated configuration.") | ||
| return | ||
| else: | ||
| msg.reply_text("Invalid autoban definition to set!") #on or off ffs | ||
| return | ||
|
|
||
| return |
There was a problem hiding this comment.
Function setban refactored with the following changes:
- Hoist repeated code outside conditional statement (
hoist-statement-from-if) - Replace multiple comparisons of same variable with
inoperator (merge-comparisons)
Comment on lines
-234
to
+241
| if param == "on" or param == "true": | ||
| if param in ["on", "true"]: | ||
| sql.setDefenseStatus(chat.id, True) | ||
| msg.reply_text("Defense mode has been turned on, this group is under attack. Every user that now joins will be auto kicked.") | ||
| return | ||
| elif param == "off" or param == "false": | ||
| elif param in ["off", "false"]: | ||
| sql.setDefenseStatus(chat.id, False) | ||
| msg.reply_text("Defense mode has been turned off, group is no longer under attack.") | ||
| return | ||
| else: | ||
| msg.reply_text("Invalid status to set!") #on or off ffs | ||
| return | ||
| msg.reply_text("Invalid status to set!") #on or off ffs | ||
|
|
||
| return |
There was a problem hiding this comment.
Function setDefense refactored with the following changes:
- Hoist repeated code outside conditional statement (
hoist-statement-from-if) - Replace multiple comparisons of same variable with
inoperator (merge-comparisons)
Comment on lines
-25
to
+45
| if chat.type != chat.PRIVATE: | ||
| if len(args) >= 1: | ||
| var = args[0] | ||
| if var == "no": | ||
| sql.set_allow_connect_to_chat(chat.id, False) | ||
| send_message(update.effective_message, "Connection has been disabled for this chat") | ||
| elif var == "yes": | ||
| sql.set_allow_connect_to_chat(chat.id, True) | ||
| send_message(update.effective_message, "Connection has been enabled for this chat") | ||
| else: | ||
| send_message(update.effective_message, "Please enter `yes` or `no`!", parse_mode=ParseMode.MARKDOWN) | ||
| if chat.type == chat.PRIVATE: | ||
| send_message(update.effective_message, "This command is for group only. Not in PM!") | ||
|
|
||
| elif args: | ||
| var = args[0] | ||
| if var == "no": | ||
| sql.set_allow_connect_to_chat(chat.id, False) | ||
| send_message(update.effective_message, "Connection has been disabled for this chat") | ||
| elif var == "yes": | ||
| sql.set_allow_connect_to_chat(chat.id, True) | ||
| send_message(update.effective_message, "Connection has been enabled for this chat") | ||
| else: | ||
| get_settings = sql.allow_connect_to_chat(chat.id) | ||
| if get_settings: | ||
| send_message(update.effective_message, "Connections to this group are *Allowed* for members!", | ||
| parse_mode=ParseMode.MARKDOWN) | ||
| else: | ||
| send_message(update.effective_message, "Connection to this group are *Not Allowed* for members!", | ||
| parse_mode=ParseMode.MARKDOWN) | ||
| send_message(update.effective_message, "Please enter `yes` or `no`!", parse_mode=ParseMode.MARKDOWN) | ||
| else: | ||
| send_message(update.effective_message, "This command is for group only. Not in PM!") | ||
| get_settings = sql.allow_connect_to_chat(chat.id) | ||
| if get_settings: | ||
| send_message(update.effective_message, "Connections to this group are *Allowed* for members!", | ||
| parse_mode=ParseMode.MARKDOWN) | ||
| else: | ||
| send_message(update.effective_message, "Connection to this group are *Not Allowed* for members!", | ||
| parse_mode=ParseMode.MARKDOWN) |
There was a problem hiding this comment.
Function allow_connections refactored with the following changes:
- Simplify sequence comparison (
simplify-len-comparison) - Swap if/else branches (
swap-if-else-branches) - Merge else clause's nested if statement into elif (
merge-else-if-into-elif)
Comment on lines
+58
to
-60
| elif msg.chat.type != "private": | ||
| return | ||
| else: | ||
| if msg.chat.type != "private": | ||
| return |
There was a problem hiding this comment.
Function connection_chat refactored with the following changes:
- Lift code into else after jump in control flow (
reintroduce-else) - Merge else clause's nested if statement into elif (
merge-else-if-into-elif)
| if len(args) >= 1: | ||
| if args: |
There was a problem hiding this comment.
Function connect_chat refactored with the following changes:
- Merge except handlers with identical code blocks (
merge-except-handler) - Simplify sequence comparison (
simplify-len-comparison)
Comment on lines
-193
to
+209
| if chat.type == chat.PRIVATE and sql.get_connected_chat(user_id): | ||
|
|
||
| conn_id = sql.get_connected_chat(user_id).chat_id | ||
| getstatusadmin = bot.get_chat_member(conn_id, msg.from_user.id) | ||
| isadmin = getstatusadmin.status in ADMIN_STATUS | ||
| ismember = getstatusadmin.status in MEMBER_STAUS | ||
| isallow = sql.allow_connect_to_chat(conn_id) | ||
|
|
||
| if isadmin or (isallow and ismember) or (user.id in SUDO_USERS) or (user.id in DEV_USERS): | ||
| if need_admin is True: | ||
| if getstatusadmin.status in ADMIN_STATUS or user_id in SUDO_USERS or user.id in DEV_USERS: | ||
| return conn_id | ||
| else: | ||
| send_message(msg, "You must be an admin in the connected group!") | ||
| raise Exception("Not admin!") | ||
| else: | ||
| return conn_id | ||
| else: | ||
| send_message(msg, "The group changed the connection rights or you are no longer an admin.\n" | ||
| "I've disconnected you.") | ||
| disconnect_chat(bot, update) | ||
| raise Exception("Not admin!") | ||
| else: | ||
| if chat.type != chat.PRIVATE or not sql.get_connected_chat(user_id): | ||
| return False | ||
| conn_id = sql.get_connected_chat(user_id).chat_id | ||
| getstatusadmin = bot.get_chat_member(conn_id, msg.from_user.id) | ||
| isadmin = getstatusadmin.status in ADMIN_STATUS | ||
| ismember = getstatusadmin.status in MEMBER_STAUS | ||
| isallow = sql.allow_connect_to_chat(conn_id) | ||
|
|
||
| if isadmin or (isallow and ismember) or (user.id in SUDO_USERS) or (user.id in DEV_USERS): | ||
| if need_admin is not True: | ||
| return conn_id | ||
| if getstatusadmin.status in ADMIN_STATUS or user_id in SUDO_USERS or user.id in DEV_USERS: | ||
| return conn_id | ||
| send_message(msg, "You must be an admin in the connected group!") | ||
| else: | ||
| send_message(msg, "The group changed the connection rights or you are no longer an admin.\n" | ||
| "I've disconnected you.") | ||
| disconnect_chat(bot, update) | ||
| raise Exception("Not admin!") |
There was a problem hiding this comment.
Function connected refactored with the following changes:
- Swap if/else branches (
swap-if-else-branches) - Remove unnecessary else after guard condition (
remove-unnecessary-else) - Hoist repeated code outside conditional statement (
hoist-statement-from-if)
Comment on lines
-139
to
+133
| if not leave: | ||
| return muted_chats | ||
| else: | ||
| if leave: |
There was a problem hiding this comment.
Function get_muted_chats refactored with the following changes:
- Hoist repeated code outside conditional statement (
hoist-statement-from-if) - Swap if/else to remove empty if body (
remove-pass-body)
Comment on lines
-160
to
154
| [InlineKeyboardButton("Leave chats", callback_data=f"db_leave_chat")] | ||
| [InlineKeyboardButton("Leave chats", callback_data='db_leave_chat')] | ||
| ] | ||
|
|
There was a problem hiding this comment.
Function leave_muted_chats refactored with the following changes:
- Replace f-string with no interpolated values with string (
remove-redundant-fstring)
Comment on lines
-179
to
+187
| if query_type == "db_leave_chat": | ||
| if query.from_user.id in admin_list: | ||
| bot.editMessageText("Leaving chats ...", chat_id, message.message_id) | ||
| chat_count = get_muted_chats(bot, update, True) | ||
| bot.sendMessage(chat_id, f"Left {chat_count} chats.") | ||
| else: | ||
| query.answer("You are not allowed to use this.") | ||
| if query_type == "db_leave_chat" and query.from_user.id in admin_list: | ||
| bot.editMessageText("Leaving chats ...", chat_id, message.message_id) | ||
| chat_count = get_muted_chats(bot, update, True) | ||
| bot.sendMessage(chat_id, f"Left {chat_count} chats.") | ||
| elif ( | ||
| query_type == "db_leave_chat" | ||
| or query_type == "db_cleanup" | ||
| and query.from_user.id not in admin_list | ||
| ): | ||
| query.answer("You are not allowed to use this.") | ||
| elif query_type == "db_cleanup": | ||
| if query.from_user.id in admin_list: | ||
| bot.editMessageText("Cleaning up DB ...", chat_id, message.message_id) | ||
| invalid_chat_count = get_invalid_chats(bot, update, True) | ||
| invalid_gban_count = get_invalid_gban(bot, update, True) | ||
| reply = "Cleaned up {} chats and {} gbanned users from db.".format(invalid_chat_count, invalid_gban_count) | ||
| bot.sendMessage(chat_id, reply) | ||
| else: | ||
| query.answer("You are not allowed to use this.") | ||
| bot.editMessageText("Cleaning up DB ...", chat_id, message.message_id) | ||
| invalid_chat_count = get_invalid_chats(bot, update, True) | ||
| invalid_gban_count = get_invalid_gban(bot, update, True) | ||
| reply = "Cleaned up {} chats and {} gbanned users from db.".format(invalid_chat_count, invalid_gban_count) | ||
| bot.sendMessage(chat_id, reply) |
There was a problem hiding this comment.
Function callback_button refactored with the following changes:
- Merge duplicate blocks in conditional (
merge-duplicate-blocks) - Remove redundant conditional (
remove-redundant-if)
Comment on lines
-21
to
+27
| reply = "That...is a chat!" | ||
| return "That...is a chat!" | ||
|
|
||
| elif user_id == bot.id: | ||
| reply = "This does not work that way." | ||
| return "This does not work that way." | ||
|
|
||
| else: | ||
| reply = None | ||
| return reply | ||
| return None |
There was a problem hiding this comment.
Function check_user_id refactored with the following changes:
- Lift return into if (
lift-return-into-if)
Comment on lines
-15
to
+23
| if info: | ||
| meaning = "" | ||
| for count, (key, value) in enumerate(info.items(), start=1): | ||
| meaning += f"<b>{count}. {word}</b> <i>({key})</i>\n" | ||
| for i in value: | ||
| defs = i.get("definition") | ||
| meaning += f"• <i>{defs}</i>\n" | ||
| msg.reply_text(meaning, parse_mode=ParseMode.HTML) | ||
| else: | ||
| return | ||
| if not info: | ||
| return | ||
| meaning = "" | ||
| for count, (key, value) in enumerate(info.items(), start=1): | ||
| meaning += f"<b>{count}. {word}</b> <i>({key})</i>\n" | ||
| for i in value: | ||
| defs = i.get("definition") | ||
| meaning += f"• <i>{defs}</i>\n" | ||
| msg.reply_text(meaning, parse_mode=ParseMode.HTML) |
There was a problem hiding this comment.
Function define refactored with the following changes:
- Swap if/else branches (
swap-if-else-branches) - Remove unnecessary else after guard condition (
remove-unnecessary-else)
sourcery-ai
bot
force-pushed
the
sourcery/main
branch
from
f744821
to
c60d395
Compare
Comment on lines
-29
to
+151
| SUPPORT_USERS = set(int(x) for x in Config.SUPPORT_USERS or []) | ||
| except ValueError: | ||
| raise Exception("Your support users list does not contain valid integers.") | ||
|
|
||
| try: | ||
| SPAMMERS = set(int(x) for x in Config.SPAMMERS or []) | ||
| except ValueError: | ||
| raise Exception("Your spammers users list does not contain valid integers.") | ||
|
|
||
| try: | ||
| WHITELIST_USERS = set(int(x) for x in Config.WHITELIST_USERS or []) | ||
| except ValueError: | ||
| raise Exception("Your whitelisted users list does not contain valid integers.") | ||
|
|
||
| try: | ||
| TIGER_USERS = set(int(x) for x in Config.TIGER_USERS or []) | ||
| except ValueError: | ||
| raise Exception("Your tiger users list does not contain valid integers.") | ||
|
|
||
| GBAN_LOGS = Config.GBAN_LOGS | ||
| WEBHOOK = Config.WEBHOOK | ||
| URL = Config.URL | ||
| PORT = Config.PORT | ||
| CERT_PATH = Config.CERT_PATH | ||
|
|
||
| DB_URI = Config.SQLALCHEMY_DATABASE_URI | ||
| DONATION_LINK = Config.DONATION_LINK | ||
| LOAD = Config.LOAD | ||
| NO_LOAD = Config.NO_LOAD | ||
| DEL_CMDS = Config.DEL_CMDS | ||
| STRICT_GBAN = Config.STRICT_GBAN | ||
| WORKERS = Config.WORKERS | ||
| BAN_STICKER = Config.BAN_STICKER | ||
| ALLOW_EXCL = Config.ALLOW_EXCL | ||
| CASH_API_KEY = Config.CASH_API_KEY | ||
| TIME_API_KEY = Config.TIME_API_KEY | ||
| API_OPENWEATHER = Config.API_OPENWEATHER | ||
| AI_API_KEY = Config.AI_API_KEY | ||
| WALL_API = Config.WALL_API | ||
| STRICT_GMUTE = Config.STRICT_GMUTE | ||
| from tg_bot.config import Development as Config | ||
| TOKEN = Config.API_KEY | ||
|
|
||
| try: | ||
| OWNER_ID = int(Config.OWNER_ID) | ||
| except ValueError: | ||
| raise Exception("Your OWNER_ID variable is not a valid integer.") | ||
|
|
||
| MESSAGE_DUMP = Config.MESSAGE_DUMP | ||
| OWNER_USERNAME = Config.OWNER_USERNAME | ||
|
|
||
| try: | ||
| SUDO_USERS = {int(x) for x in Config.SUDO_USERS or []} | ||
| DEV_USERS = {int(x) for x in Config.DEV_USERS or []} | ||
| except ValueError: | ||
| raise Exception("Your sudo or dev users list does not contain valid integers.") | ||
|
|
||
| try: | ||
| SUPPORT_USERS = {int(x) for x in Config.SUPPORT_USERS or []} | ||
| except ValueError: | ||
| raise Exception("Your support users list does not contain valid integers.") | ||
|
|
||
| try: | ||
| SPAMMERS = {int(x) for x in Config.SPAMMERS or []} | ||
| except ValueError: | ||
| raise Exception("Your spammers users list does not contain valid integers.") | ||
|
|
||
| try: | ||
| WHITELIST_USERS = {int(x) for x in Config.WHITELIST_USERS or []} | ||
| except ValueError: | ||
| raise Exception("Your whitelisted users list does not contain valid integers.") | ||
|
|
||
| try: | ||
| TIGER_USERS = {int(x) for x in Config.TIGER_USERS or []} | ||
| except ValueError: | ||
| raise Exception("Your tiger users list does not contain valid integers.") | ||
|
|
||
| GBAN_LOGS = Config.GBAN_LOGS | ||
| WEBHOOK = Config.WEBHOOK | ||
| URL = Config.URL | ||
| PORT = Config.PORT | ||
| CERT_PATH = Config.CERT_PATH | ||
|
|
||
| DB_URI = Config.SQLALCHEMY_DATABASE_URI | ||
| DONATION_LINK = Config.DONATION_LINK | ||
| LOAD = Config.LOAD | ||
| NO_LOAD = Config.NO_LOAD | ||
| DEL_CMDS = Config.DEL_CMDS | ||
| STRICT_GBAN = Config.STRICT_GBAN | ||
| WORKERS = Config.WORKERS | ||
| BAN_STICKER = Config.BAN_STICKER | ||
| ALLOW_EXCL = Config.ALLOW_EXCL | ||
| CASH_API_KEY = Config.CASH_API_KEY | ||
| TIME_API_KEY = Config.TIME_API_KEY | ||
| API_OPENWEATHER = Config.API_OPENWEATHER | ||
| AI_API_KEY = Config.AI_API_KEY | ||
| WALL_API = Config.WALL_API | ||
| STRICT_GMUTE = Config.STRICT_GMUTE | ||
|
|
There was a problem hiding this comment.
Lines 29-148 refactored with the following changes:
- Replace list(), dict() or set() with comprehension (
collection-builtin-to-comprehension)
| if not imported_module.__mod_name__.lower() in IMPORTED: | ||
| if imported_module.__mod_name__.lower() not in IMPORTED: |
There was a problem hiding this comment.
Lines 73-73 refactored with the following changes:
- Simplify logical expression using De Morgan identities (
de-morgan)
| if len(args) >= 1: | ||
| if args: |
There was a problem hiding this comment.
Function start refactored with the following changes:
- Simplify sequence comparison (
simplify-len-comparison)
Comment on lines
-238
to
+242
| if excp.message == "Message is not modified": | ||
| pass | ||
| elif excp.message == "Query_id_invalid": | ||
| pass | ||
| elif excp.message == "Message can't be deleted": | ||
| pass | ||
| else: | ||
| if excp.message not in [ | ||
| "Message is not modified", | ||
| "Query_id_invalid", | ||
| "Message can't be deleted", | ||
| ]: |
There was a problem hiding this comment.
Function help_button refactored with the following changes:
- Simplify conditional into switch-like form (
switch) - Swap if/else to remove empty if body (
remove-pass-body)
Comment on lines
-335
to
-336
| else: | ||
| pass |
There was a problem hiding this comment.
Function help_button.get_help.imdb refactored with the following changes:
- Remove redundant pass statement (
remove-redundant-pass)
Comment on lines
-78
to
+82
| if len(args) >= 1: | ||
| if args: | ||
|
|
||
| val = args[0].lower() | ||
|
|
||
| if val == "off" or val == "no" or val == "0": | ||
| if val in ["off", "no", "0"]: |
There was a problem hiding this comment.
Function set_flood refactored with the following changes:
- Hoist repeated code outside conditional statement (
hoist-statement-from-if) - Replace multiple comparisons of same variable with
inoperator (merge-comparisons) - Simplify sequence comparison (
simplify-len-comparison)
Comment on lines
-39
to
+43
| if excp.message == "User not found": | ||
| message.reply_text("Can't seem to find this person.") | ||
| return log_message | ||
| else: | ||
| if excp.message != "User not found": | ||
| raise | ||
|
|
||
| message.reply_text("Can't seem to find this person.") | ||
| return log_message |
There was a problem hiding this comment.
Function ban refactored with the following changes:
- Swap if/else branches (
swap-if-else-branches) - Remove unnecessary else after guard condition (
remove-unnecessary-else)
Comment on lines
-103
to
+106
| if excp.message == "User not found": | ||
| message.reply_text("I can't seem to find this user.") | ||
| return log_message | ||
| else: | ||
| if excp.message != "User not found": | ||
| raise | ||
|
|
||
| message.reply_text("I can't seem to find this user.") | ||
| return log_message |
There was a problem hiding this comment.
Function temp_ban refactored with the following changes:
- Replace if statement with if expression (
assign-if-exp) - Swap if/else branches (
swap-if-else-branches) - Remove unnecessary else after guard condition (
remove-unnecessary-else)
Comment on lines
-185
to
+183
| if excp.message == "User not found": | ||
| message.reply_text("I can't seem to find this user.") | ||
| return log_message | ||
| else: | ||
| if excp.message != "User not found": | ||
| raise | ||
|
|
||
| message.reply_text("I can't seem to find this user.") | ||
| return log_message |
There was a problem hiding this comment.
Function punch refactored with the following changes:
- Swap if/else branches (
swap-if-else-branches) - Remove unnecessary else after guard condition (
remove-unnecessary-else)
Comment on lines
-256
to
+253
| if excp.message == "User not found": | ||
| message.reply_text("I can't seem to find this user.") | ||
| return log_message | ||
| else: | ||
| if excp.message != "User not found": | ||
| raise | ||
|
|
||
| message.reply_text("I can't seem to find this user.") | ||
| return log_message |
There was a problem hiding this comment.
Function unban refactored with the following changes:
- Swap if/else branches (
swap-if-else-branches) - Remove unnecessary else after guard condition (
remove-unnecessary-else)
| if len(args) > 0 and args[0].lower() == 'copy': | ||
| if args and args[0].lower() == 'copy': |
There was a problem hiding this comment.
Function blacklist refactored with the following changes:
- Simplify sequence comparison (
simplify-len-comparison)
Comment on lines
-66
to
+73
| to_blacklist = list(set(trigger.strip() for trigger in text.split("\n") if trigger.strip())) | ||
| to_blacklist = list( | ||
| { | ||
| trigger.strip() | ||
| for trigger in text.split("\n") | ||
| if trigger.strip() | ||
| } | ||
| ) | ||
|
|
There was a problem hiding this comment.
Function add_blacklist refactored with the following changes:
- Replace list(), dict() or set() with comprehension (
collection-builtin-to-comprehension)
Comment on lines
-93
to
+107
| to_unblacklist = list(set(trigger.strip() for trigger in text.split("\n") if trigger.strip())) | ||
| to_unblacklist = list( | ||
| { | ||
| trigger.strip() | ||
| for trigger in text.split("\n") | ||
| if trigger.strip() | ||
| } | ||
| ) | ||
|
|
There was a problem hiding this comment.
Function unblacklist refactored with the following changes:
- Replace list(), dict() or set() with comprehension (
collection-builtin-to-comprehension)
Comment on lines
-140
to
+154
| if excp.message == "Message to delete not found": | ||
| pass | ||
| else: | ||
| if excp.message != "Message to delete not found": |
There was a problem hiding this comment.
Function del_blacklist refactored with the following changes:
- Swap if/else to remove empty if body (
remove-pass-body)
Comment on lines
-32
to
+33
|
|
||
|
|
There was a problem hiding this comment.
Function blackliststicker refactored with the following changes:
- Simplify sequence comparison (
simplify-len-comparison) - Remove unnecessary else after guard condition (
remove-unnecessary-else)
Comment on lines
-134
to
+126
| if len(args) >= 1: | ||
| if args: |
There was a problem hiding this comment.
Function add_bluetext_ignore_global refactored with the following changes:
- Simplify sequence comparison (
simplify-len-comparison)
Comment on lines
-154
to
+146
| if len(args) >= 1: | ||
| if args: |
There was a problem hiding this comment.
Function remove_bluetext_ignore_global refactored with the following changes:
- Simplify sequence comparison (
simplify-len-comparison)
Comment on lines
-38
to
+47
| if param == "on" or param == "true": | ||
| if param in ["on", "true"]: | ||
| sql.set_cas_status(chat.id, True) | ||
| msg.reply_text("Successfully updated configuration.") | ||
| return | ||
| elif param == "off" or param == "false": | ||
| elif param in ["off", "false"]: | ||
| sql.set_cas_status(chat.id, False) | ||
| msg.reply_text("Successfully updated configuration.") | ||
| return | ||
| else: | ||
| msg.reply_text("Invalid status to set!") #on or off ffs | ||
| return | ||
|
|
||
| return |
There was a problem hiding this comment.
Function setcas refactored with the following changes:
- Hoist repeated code outside conditional statement (
hoist-statement-from-if) - Replace multiple comparisons of same variable with
inoperator (merge-comparisons)
Comment on lines
-60
to
+68
| if param == "on" or param == "true": | ||
| if param in ["on", "true"]: | ||
| sql.set_cas_autoban(chat.id, True) | ||
| msg.reply_text("Successfully updated configuration.") | ||
| return | ||
| elif param == "off" or param == "false": | ||
| elif param in ["off", "false"]: | ||
| sql.set_cas_autoban(chat.id, False) | ||
| msg.reply_text("Successfully updated configuration.") | ||
| return | ||
| else: | ||
| msg.reply_text("Invalid autoban definition to set!") #on or off ffs | ||
| return | ||
|
|
||
| return |
There was a problem hiding this comment.
Function setban refactored with the following changes:
- Hoist repeated code outside conditional statement (
hoist-statement-from-if) - Replace multiple comparisons of same variable with
inoperator (merge-comparisons)
Comment on lines
-123
to
+121
| elif user_id and int(user_id) == 777000: | ||
| elif user_id: |
There was a problem hiding this comment.
Function caschecker refactored with the following changes:
- Remove redundant conditional (
remove-redundant-if)
Comment on lines
-234
to
+241
| if param == "on" or param == "true": | ||
| if param in ["on", "true"]: | ||
| sql.setDefenseStatus(chat.id, True) | ||
| msg.reply_text("Defense mode has been turned on, this group is under attack. Every user that now joins will be auto kicked.") | ||
| return | ||
| elif param == "off" or param == "false": | ||
| elif param in ["off", "false"]: | ||
| sql.setDefenseStatus(chat.id, False) | ||
| msg.reply_text("Defense mode has been turned off, group is no longer under attack.") | ||
| return | ||
| else: | ||
| msg.reply_text("Invalid status to set!") #on or off ffs | ||
| return | ||
| msg.reply_text("Invalid status to set!") #on or off ffs | ||
|
|
||
| return |
There was a problem hiding this comment.
Function setDefense refactored with the following changes:
- Hoist repeated code outside conditional statement (
hoist-statement-from-if) - Replace multiple comparisons of same variable with
inoperator (merge-comparisons)
Comment on lines
-25
to
+45
| if chat.type != chat.PRIVATE: | ||
| if len(args) >= 1: | ||
| var = args[0] | ||
| if var == "no": | ||
| sql.set_allow_connect_to_chat(chat.id, False) | ||
| send_message(update.effective_message, "Connection has been disabled for this chat") | ||
| elif var == "yes": | ||
| sql.set_allow_connect_to_chat(chat.id, True) | ||
| send_message(update.effective_message, "Connection has been enabled for this chat") | ||
| else: | ||
| send_message(update.effective_message, "Please enter `yes` or `no`!", parse_mode=ParseMode.MARKDOWN) | ||
| if chat.type == chat.PRIVATE: | ||
| send_message(update.effective_message, "This command is for group only. Not in PM!") | ||
|
|
||
| elif args: | ||
| var = args[0] | ||
| if var == "no": | ||
| sql.set_allow_connect_to_chat(chat.id, False) | ||
| send_message(update.effective_message, "Connection has been disabled for this chat") | ||
| elif var == "yes": | ||
| sql.set_allow_connect_to_chat(chat.id, True) | ||
| send_message(update.effective_message, "Connection has been enabled for this chat") | ||
| else: | ||
| get_settings = sql.allow_connect_to_chat(chat.id) | ||
| if get_settings: | ||
| send_message(update.effective_message, "Connections to this group are *Allowed* for members!", | ||
| parse_mode=ParseMode.MARKDOWN) | ||
| else: | ||
| send_message(update.effective_message, "Connection to this group are *Not Allowed* for members!", | ||
| parse_mode=ParseMode.MARKDOWN) | ||
| send_message(update.effective_message, "Please enter `yes` or `no`!", parse_mode=ParseMode.MARKDOWN) | ||
| else: | ||
| send_message(update.effective_message, "This command is for group only. Not in PM!") | ||
| get_settings = sql.allow_connect_to_chat(chat.id) | ||
| if get_settings: | ||
| send_message(update.effective_message, "Connections to this group are *Allowed* for members!", | ||
| parse_mode=ParseMode.MARKDOWN) | ||
| else: | ||
| send_message(update.effective_message, "Connection to this group are *Not Allowed* for members!", | ||
| parse_mode=ParseMode.MARKDOWN) |
There was a problem hiding this comment.
Function allow_connections refactored with the following changes:
- Simplify sequence comparison (
simplify-len-comparison) - Swap if/else branches (
swap-if-else-branches) - Merge else clause's nested if statement into elif (
merge-else-if-into-elif)
Comment on lines
+58
to
-60
| elif msg.chat.type != "private": | ||
| return | ||
| else: | ||
| if msg.chat.type != "private": | ||
| return |
There was a problem hiding this comment.
Function connection_chat refactored with the following changes:
- Lift code into else after jump in control flow (
reintroduce-else) - Merge else clause's nested if statement into elif (
merge-else-if-into-elif)
| if len(args) >= 1: | ||
| if args: |
There was a problem hiding this comment.
Function connect_chat refactored with the following changes:
- Merge except handlers with identical code blocks (
merge-except-handler) - Simplify sequence comparison (
simplify-len-comparison)
Comment on lines
-193
to
+209
| if chat.type == chat.PRIVATE and sql.get_connected_chat(user_id): | ||
|
|
||
| conn_id = sql.get_connected_chat(user_id).chat_id | ||
| getstatusadmin = bot.get_chat_member(conn_id, msg.from_user.id) | ||
| isadmin = getstatusadmin.status in ADMIN_STATUS | ||
| ismember = getstatusadmin.status in MEMBER_STAUS | ||
| isallow = sql.allow_connect_to_chat(conn_id) | ||
|
|
||
| if isadmin or (isallow and ismember) or (user.id in SUDO_USERS) or (user.id in DEV_USERS): | ||
| if need_admin is True: | ||
| if getstatusadmin.status in ADMIN_STATUS or user_id in SUDO_USERS or user.id in DEV_USERS: | ||
| return conn_id | ||
| else: | ||
| send_message(msg, "You must be an admin in the connected group!") | ||
| raise Exception("Not admin!") | ||
| else: | ||
| return conn_id | ||
| else: | ||
| send_message(msg, "The group changed the connection rights or you are no longer an admin.\n" | ||
| "I've disconnected you.") | ||
| disconnect_chat(bot, update) | ||
| raise Exception("Not admin!") | ||
| else: | ||
| if chat.type != chat.PRIVATE or not sql.get_connected_chat(user_id): | ||
| return False | ||
| conn_id = sql.get_connected_chat(user_id).chat_id | ||
| getstatusadmin = bot.get_chat_member(conn_id, msg.from_user.id) | ||
| isadmin = getstatusadmin.status in ADMIN_STATUS | ||
| ismember = getstatusadmin.status in MEMBER_STAUS | ||
| isallow = sql.allow_connect_to_chat(conn_id) | ||
|
|
||
| if isadmin or (isallow and ismember) or (user.id in SUDO_USERS) or (user.id in DEV_USERS): | ||
| if need_admin is not True: | ||
| return conn_id | ||
| if getstatusadmin.status in ADMIN_STATUS or user_id in SUDO_USERS or user.id in DEV_USERS: | ||
| return conn_id | ||
| send_message(msg, "You must be an admin in the connected group!") | ||
| else: | ||
| send_message(msg, "The group changed the connection rights or you are no longer an admin.\n" | ||
| "I've disconnected you.") | ||
| disconnect_chat(bot, update) | ||
| raise Exception("Not admin!") |
There was a problem hiding this comment.
Function connected refactored with the following changes:
- Swap if/else branches (
swap-if-else-branches) - Remove unnecessary else after guard condition (
remove-unnecessary-else) - Hoist repeated code outside conditional statement (
hoist-statement-from-if)
Comment on lines
-139
to
+133
| if not leave: | ||
| return muted_chats | ||
| else: | ||
| if leave: |
There was a problem hiding this comment.
Function get_muted_chats refactored with the following changes:
- Hoist repeated code outside conditional statement (
hoist-statement-from-if) - Swap if/else to remove empty if body (
remove-pass-body)
Comment on lines
-160
to
154
| [InlineKeyboardButton("Leave chats", callback_data=f"db_leave_chat")] | ||
| [InlineKeyboardButton("Leave chats", callback_data='db_leave_chat')] | ||
| ] | ||
|
|
There was a problem hiding this comment.
Function leave_muted_chats refactored with the following changes:
- Replace f-string with no interpolated values with string (
remove-redundant-fstring)
Comment on lines
-179
to
+187
| if query_type == "db_leave_chat": | ||
| if query.from_user.id in admin_list: | ||
| bot.editMessageText("Leaving chats ...", chat_id, message.message_id) | ||
| chat_count = get_muted_chats(bot, update, True) | ||
| bot.sendMessage(chat_id, f"Left {chat_count} chats.") | ||
| else: | ||
| query.answer("You are not allowed to use this.") | ||
| if query_type == "db_leave_chat" and query.from_user.id in admin_list: | ||
| bot.editMessageText("Leaving chats ...", chat_id, message.message_id) | ||
| chat_count = get_muted_chats(bot, update, True) | ||
| bot.sendMessage(chat_id, f"Left {chat_count} chats.") | ||
| elif ( | ||
| query_type == "db_leave_chat" | ||
| or query_type == "db_cleanup" | ||
| and query.from_user.id not in admin_list | ||
| ): | ||
| query.answer("You are not allowed to use this.") | ||
| elif query_type == "db_cleanup": | ||
| if query.from_user.id in admin_list: | ||
| bot.editMessageText("Cleaning up DB ...", chat_id, message.message_id) | ||
| invalid_chat_count = get_invalid_chats(bot, update, True) | ||
| invalid_gban_count = get_invalid_gban(bot, update, True) | ||
| reply = "Cleaned up {} chats and {} gbanned users from db.".format(invalid_chat_count, invalid_gban_count) | ||
| bot.sendMessage(chat_id, reply) | ||
| else: | ||
| query.answer("You are not allowed to use this.") | ||
| bot.editMessageText("Cleaning up DB ...", chat_id, message.message_id) | ||
| invalid_chat_count = get_invalid_chats(bot, update, True) | ||
| invalid_gban_count = get_invalid_gban(bot, update, True) | ||
| reply = "Cleaned up {} chats and {} gbanned users from db.".format(invalid_chat_count, invalid_gban_count) | ||
| bot.sendMessage(chat_id, reply) |
There was a problem hiding this comment.
Function callback_button refactored with the following changes:
- Merge duplicate blocks in conditional (
merge-duplicate-blocks) - Remove redundant conditional (
remove-redundant-if)
Comment on lines
-21
to
+27
| reply = "That...is a chat!" | ||
| return "That...is a chat!" | ||
|
|
||
| elif user_id == bot.id: | ||
| reply = "This does not work that way." | ||
| return "This does not work that way." | ||
|
|
||
| else: | ||
| reply = None | ||
| return reply | ||
| return None |
There was a problem hiding this comment.
Function check_user_id refactored with the following changes:
- Lift return into if (
lift-return-into-if)
Comment on lines
-15
to
+23
| if info: | ||
| meaning = "" | ||
| for count, (key, value) in enumerate(info.items(), start=1): | ||
| meaning += f"<b>{count}. {word}</b> <i>({key})</i>\n" | ||
| for i in value: | ||
| defs = i.get("definition") | ||
| meaning += f"• <i>{defs}</i>\n" | ||
| msg.reply_text(meaning, parse_mode=ParseMode.HTML) | ||
| else: | ||
| return | ||
| if not info: | ||
| return | ||
| meaning = "" | ||
| for count, (key, value) in enumerate(info.items(), start=1): | ||
| meaning += f"<b>{count}. {word}</b> <i>({key})</i>\n" | ||
| for i in value: | ||
| defs = i.get("definition") | ||
| meaning += f"• <i>{defs}</i>\n" | ||
| msg.reply_text(meaning, parse_mode=ParseMode.HTML) |
There was a problem hiding this comment.
Function define refactored with the following changes:
- Swap if/else branches (
swap-if-else-branches) - Remove unnecessary else after guard condition (
remove-unnecessary-else)
Sourcery Code Quality Report✅ Merging this PR will increase code quality in the affected files by 0.69%.
Here are some functions in these files that still need a tune-up:
Legend and ExplanationThe emojis denote the absolute quality of the code:
The 👍 and 👎 indicate whether the quality has improved or gotten worse with this pull request. Please see our documentation here for details on how these metrics are calculated. We are actively working on this report - lots more documentation and extra metrics to come! Help us improve this quality report! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Branch
mainrefactored by Sourcery.If you're happy with these changes, merge this Pull Request using the Squash and merge strategy.
See our documentation here.
Run Sourcery locally
Reduce the feedback loop during development by using the Sourcery editor plugin:
Review changes via command line
To manually merge these changes, make sure you're on the
mainbranch, then run:Help us improve this pull request!