This repository has been archived by the owner on Sep 8, 2023. It is now read-only.
Sourcery refactored main branch #3
Open
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}
sourcery-ai
bot
force-pushed
the
sourcery/main
branch
from
8df69b5
to
f8d57b6
Compare
Comment on lines
-133
to
+136
| sw = spamwatch.Client(spamwatch_api) | ||
| return sw | ||
| return spamwatch.Client(spamwatch_api) | ||
| except: | ||
| sw = None | ||
| log.warning("Can't connect to SpamWatch!") | ||
| return sw | ||
| return None |
There was a problem hiding this comment.
Function KyosukeINIT.init_sw refactored with the following changes:
- Inline variable that is immediately returned [×2] (
inline-immediately-returned-variable) - Move assignment closer to its usage within a block (
move-assign-in-block)
Comment on lines
-273
to
+271
| apps = [] | ||
| apps.append(pbot) | ||
| apps = [pbot] |
There was a problem hiding this comment.
Lines 273-274 refactored with the following changes:
- Merge append into list declaration (
merge-list-append)
| imported_module = importlib.import_module("kyosuke.modules." + module_name) | ||
| imported_module = importlib.import_module(f"kyosuke.modules.{module_name}") |
There was a problem hiding this comment.
Lines 87-87 refactored with the following changes:
- Use f-string instead of string concatenation (
use-fstring-for-concatenation)
Comment on lines
-172
to
+173
| url="t.me/{}?startgroup=true".format( | ||
| context.bot.username | ||
| ), | ||
| ), | ||
| url=f"t.me/{context.bot.username}?startgroup=true", | ||
| ) |
There was a problem hiding this comment.
Function start refactored with the following changes:
- Replace call to format with f-string [×3] (
use-fstring-for-formatting) - Use f-string instead of string concatenation (
use-fstring-for-concatenation) - Replace f-string with no interpolated values with string (
remove-redundant-fstring) - Replace m.group(x) with m[x] for re.Match objects [×3] (
use-getitem-for-re-match-groups)
Comment on lines
-300
to
+302
| module = mod_match.group(1) | ||
| module = mod_match[1] |
There was a problem hiding this comment.
Function help_button refactored with the following changes:
- Replace m.group(x) with m[x] for re.Match objects [×3] (
use-getitem-for-re-match-groups) - Replace call to format with f-string (
use-fstring-for-formatting) - Use f-string instead of string concatenation (
use-fstring-for-concatenation) - Replace f-string with no interpolated values with string (
remove-redundant-fstring)
| args["pattern"] = "(?i)" + pattern | ||
| args["pattern"] = f"(?i){pattern}" |
There was a problem hiding this comment.
Function inlinequery refactored with the following changes:
- Use f-string instead of string concatenation (
use-fstring-for-concatenation)
| args["pattern"] = "(?i)" + pattern | ||
| args["pattern"] = f"(?i){pattern}" |
There was a problem hiding this comment.
Function bot refactored with the following changes:
- Use f-string instead of string concatenation (
use-fstring-for-concatenation) - Replace m.group(x) with m[x] for re.Match objects (
use-getitem-for-re-match-groups) - Swap if/else to remove empty if body [×2] (
remove-pass-body) - Remove redundant pass statement (
remove-redundant-pass)
Comment on lines
-152
to
+150
| unsafe_pattern = r"^[^/!#@\$A-Za-z]" | ||
| group_only = args.get("group_only", False) | ||
| disable_errors = args.get("disable_errors", False) | ||
| insecure = args.get("insecure", False) | ||
| if pattern is not None and not pattern.startswith("(?i)"): | ||
| args["pattern"] = "(?i)" + pattern | ||
| args["pattern"] = f"(?i){pattern}" |
There was a problem hiding this comment.
Function kyosuke refactored with the following changes:
- Move assignments closer to their usage (
move-assign) - Use f-string instead of string concatenation (
use-fstring-for-concatenation)
| if not obj: | ||
| return False | ||
| string = codecs.encode(pickle.dumps(obj), "base64").decode() | ||
| return string | ||
| return codecs.encode(pickle.dumps(obj), "base64").decode() if obj else False |
There was a problem hiding this comment.
Function obj_to_str refactored with the following changes:
- Inline variable that is immediately returned (
inline-immediately-returned-variable) - Lift code into else after jump in control flow (
reintroduce-else) - Swap if/else branches (
swap-if-else-branches) - Replace if statement with if expression (
assign-if-exp)
Comment on lines
-45
to
+42
| obj = pickle.loads(codecs.decode(string.encode(), "base64")) | ||
| return obj | ||
| return pickle.loads(codecs.decode(string.encode(), "base64")) |
There was a problem hiding this comment.
Function str_to_obj refactored with the following changes:
- Inline variable that is immediately returned (
inline-immediately-returned-variable)
Comment on lines
-64
to
+60
| if not _notes: | ||
| return {} | ||
| return _notes["notes"] | ||
| return {} if not _notes else _notes["notes"] |
There was a problem hiding this comment.
Function _get_notes refactored with the following changes:
- Lift code into else after jump in control flow (
reintroduce-else) - Replace if statement with if expression (
assign-if-exp)
Comment on lines
-70
to
+64
| _notes = [] | ||
| for note in await _get_notes(chat_id): | ||
| _notes.append(note) | ||
| return _notes | ||
| return list(await _get_notes(chat_id)) |
There was a problem hiding this comment.
Function get_note_names refactored with the following changes:
- Convert for loop into list comprehension (
list-comprehension) - Replace identity comprehension with call to collection constructor (
identity-comprehension) - Inline variable that is immediately returned (
inline-immediately-returned-variable)
Comment on lines
-79
to
+70
| if name in _notes: | ||
| return _notes[name] | ||
| return False | ||
| return _notes[name] if name in _notes else False |
There was a problem hiding this comment.
Function get_note refactored with the following changes:
- Lift code into else after jump in control flow (
reintroduce-else) - Replace if statement with if expression (
assign-if-exp)
Comment on lines
-126
to
+115
| if not _filters: | ||
| return {} | ||
| return _filters["filters"] | ||
| return {} if not _filters else _filters["filters"] |
There was a problem hiding this comment.
Function _get_filters refactored with the following changes:
- Lift code into else after jump in control flow (
reintroduce-else) - Replace if statement with if expression (
assign-if-exp)
Comment on lines
-132
to
+119
| _filters = [] | ||
| for _filter in await _get_filters(chat_id): | ||
| _filters.append(_filter) | ||
| return _filters | ||
| return list(await _get_filters(chat_id)) |
There was a problem hiding this comment.
Function get_filters_names refactored with the following changes:
- Convert for loop into list comprehension (
list-comprehension) - Replace identity comprehension with call to collection constructor (
identity-comprehension) - Inline variable that is immediately returned (
inline-immediately-returned-variable)
Comment on lines
-341
to
+308
| if not chats: | ||
| return [] | ||
| chats_list = [] | ||
| for chat in await chats.to_list(length=1000000000): | ||
| chats_list.append(chat) | ||
| return chats_list | ||
| return [] if not chats else list(await chats.to_list(length=1000000000)) |
There was a problem hiding this comment.
Function get_served_chats refactored with the following changes:
- Convert for loop into list comprehension (
list-comprehension) - Lift code into else after jump in control flow (
reintroduce-else) - Replace if statement with if expression (
assign-if-exp) - Replace identity comprehension with call to collection constructor (
identity-comprehension) - Inline variable that is immediately returned (
inline-immediately-returned-variable)
Comment on lines
-365
to
+327
| if not user: | ||
| return False | ||
| return True | ||
| return bool(user) |
There was a problem hiding this comment.
Function is_served_user refactored with the following changes:
- Lift code into else after jump in control flow (
reintroduce-else) - Replace if statement with if expression (
assign-if-exp) - Simplify boolean if expression (
boolean-if-exp-identity)
Comment on lines
-372
to
+332
| if not users: | ||
| return [] | ||
| users_list = [] | ||
| for user in await users.to_list(length=1000000000): | ||
| users_list.append(user) | ||
| return users_list | ||
| return [] if not users else list(await users.to_list(length=1000000000)) |
There was a problem hiding this comment.
Function get_served_users refactored with the following changes:
- Convert for loop into list comprehension (
list-comprehension) - Lift code into else after jump in control flow (
reintroduce-else) - Replace if statement with if expression (
assign-if-exp) - Replace identity comprehension with call to collection constructor (
identity-comprehension) - Inline variable that is immediately returned (
inline-immediately-returned-variable)
Comment on lines
-395
to
+350
| if not user: | ||
| return False | ||
| return True | ||
| return bool(user) |
There was a problem hiding this comment.
Function is_gbanned_user refactored with the following changes:
- Lift code into else after jump in control flow (
reintroduce-else) - Replace if statement with if expression (
assign-if-exp) - Simplify boolean if expression (
boolean-if-exp-identity)
Comment on lines
-416
to
+369
| if not lovers: | ||
| return {} | ||
| return lovers["couple"] | ||
| return {} if not lovers else lovers["couple"] |
There was a problem hiding this comment.
Function _get_lovers refactored with the following changes:
- Lift code into else after jump in control flow (
reintroduce-else) - Replace if statement with if expression (
assign-if-exp)
Comment on lines
-423
to
+374
| if date in lovers: | ||
| return lovers[date] | ||
| return False | ||
| return lovers[date] if date in lovers else False |
There was a problem hiding this comment.
Function get_couple refactored with the following changes:
- Lift code into else after jump in control flow (
reintroduce-else) - Replace if statement with if expression (
assign-if-exp)
Comment on lines
-440
to
+389
| if not chat: | ||
| return True | ||
| return False | ||
| return not chat |
There was a problem hiding this comment.
Function is_captcha_on refactored with the following changes:
- Lift code into else after jump in control flow (
reintroduce-else) - Replace if statement with if expression (
assign-if-exp) - Simplify boolean if expression (
boolean-if-exp-identity) - Remove unnecessary casts to int, str, float or bool (
remove-unnecessary-cast)
Comment on lines
-476
to
+423
| if not chat: | ||
| return True | ||
| return False | ||
| return not chat |
There was a problem hiding this comment.
Function is_antiservice_on refactored with the following changes:
- Lift code into else after jump in control flow (
reintroduce-else) - Replace if statement with if expression (
assign-if-exp) - Simplify boolean if expression (
boolean-if-exp-identity) - Remove unnecessary casts to int, str, float or bool (
remove-unnecessary-cast)
Comment on lines
-497
to
+442
| if not user: | ||
| return False | ||
| return True | ||
| return bool(user) |
There was a problem hiding this comment.
Function is_pmpermit_approved refactored with the following changes:
- Lift code into else after jump in control flow (
reintroduce-else) - Replace if statement with if expression (
assign-if-exp) - Simplify boolean if expression (
boolean-if-exp-identity)
Comment on lines
-518
to
+461
| if not text: | ||
| return "" | ||
| return text["text"] | ||
| return "" if not text else text["text"] |
There was a problem hiding this comment.
Function get_welcome refactored with the following changes:
- Lift code into else after jump in control flow (
reintroduce-else) - Replace if statement with if expression (
assign-if-exp)
kyosuke/modules/admin.py
Outdated
| @rencmd(command="promote", pass_args=True) | ||
| @rencmd(command="promote", pass_args=True) |
There was a problem hiding this comment.
Function promote refactored with the following changes:
- Inline variable that is immediately returned (
inline-immediately-returned-variable)
kyosuke/modules/admin.py
Outdated
Comment on lines
289
to
282
| log_message = ( | ||
| f"<b>{html.escape(chat.title)}:</b>\n" | ||
| f"#LOWPROMOTED\n" | ||
| f"<b>Admin:</b> {mention_html(user.id, user.first_name)}\n" | ||
| f"<b>User:</b> {mention_html(user_member.user.id, user_member.user.first_name)}" | ||
| ) | ||
|
|
||
| return log_message | ||
| return f"<b>{html.escape(chat.title)}:</b>\n#LOWPROMOTED\n<b>Admin:</b> {mention_html(user.id, user.first_name)}\n<b>User:</b> {mention_html(user_member.user.id, user_member.user.first_name)}" |
There was a problem hiding this comment.
Function lowpromote refactored with the following changes:
- Inline variable that is immediately returned (
inline-immediately-returned-variable)
Comment on lines
-366
to
+360
| keyboard = InlineKeyboardMarkup([[ | ||
| InlineKeyboardButton( | ||
| "Demote", callback_data="demote_({})".format(user_member.user.id)) | ||
| ]]) | ||
| keyboard = InlineKeyboardMarkup( | ||
| [ | ||
| [ | ||
| InlineKeyboardButton( | ||
| "Demote", callback_data=f"demote_({user_member.user.id})" | ||
| ) | ||
| ] | ||
| ] | ||
| ) |
There was a problem hiding this comment.
Function fullpromote refactored with the following changes:
- Replace call to format with f-string (
use-fstring-for-formatting) - Inline variable that is immediately returned (
inline-immediately-returned-variable)
Comment on lines
-414
to
+398
| if not user_member.status == "administrator": | ||
| if user_member.status != "administrator": |
There was a problem hiding this comment.
Function demote refactored with the following changes:
- Simplify logical expression using De Morgan identities (
de-morgan) - Inline variable that is immediately returned (
inline-immediately-returned-variable)
kyosuke/modules/admin.py
Outdated
Comment on lines
553
to
561
| is_group = chat.type != "private" and chat.type != "channel" | ||
| is_group = chat.type not in ["private", "channel"] | ||
| prev_message = update.effective_message.reply_to_message | ||
|
|
||
| if prev_message is None: | ||
| msg.reply_text("Reply a message to pin it!") | ||
| return | ||
|
|
||
| is_silent = True | ||
| if len(args) >= 1: | ||
| if prev_message and is_group: | ||
| is_silent = ( | ||
| 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 len(args) >= 1 | ||
| else True | ||
| ) | ||
|
|
||
| if prev_message and is_group: | ||
| try: | ||
| bot.pinChatMessage( | ||
| chat.id, prev_message.message_id, disable_notification=is_silent | ||
| ) | ||
| msg.reply_text( | ||
| f"I have pinned a message.", | ||
| "I have pinned a message.", | ||
| reply_markup=InlineKeyboardMarkup( | ||
| [ | ||
| [ | ||
| InlineKeyboardButton( | ||
| "👀 Go to message", url=f"{message_link}") | ||
| "👀 Go to message", url=f"{message_link}" | ||
| ) | ||
| ] | ||
| ] | ||
| ), | ||
| ), |
There was a problem hiding this comment.
Function pin refactored with the following changes:
- Replace multiple comparisons of same variable with
inoperator (merge-comparisons) - Move setting of default value for variable into
elsebranch (introduce-default-else) - Replace f-string with no interpolated values with string (
remove-redundant-fstring) - Inline variable that is immediately returned (
inline-immediately-returned-variable) - Replace if statement with if expression (
assign-if-exp) - Move assignments closer to their usage (
move-assign)
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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!