Sourcery Starbot ⭐ refactored iranzo/stampython #29
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
commented
May 22, 2023
stampy/env.py
Outdated
Comment on lines
49
to
50
| # if a database path was provided, override the one in alembic.ini | ||
| database = context.get_x_argument(as_dictionary=True).get('database') | ||
| if database: | ||
| url = "sqlite:///%s" % database | ||
| if database := context.get_x_argument(as_dictionary=True).get('database'): | ||
| url = f"sqlite:///{database}" |
There was a problem hiding this comment.
Function run_migrations_offline refactored with the following changes:
- Use named expression to simplify assignment and conditional (
use-named-expression) - Replace interpolated string formatting with f-string (
replace-interpolation-with-fstring)
This removes the following comments ( why? ):
# if a database path was provided, override the one in alembic.ini
stampy/env.py
Outdated
Comment on lines
74
to
73
| # if a database path was provided, override the one in alembic.ini | ||
| database = context.get_x_argument(as_dictionary=True).get('database') | ||
| if database: | ||
| ini_section['sqlalchemy.url'] = "sqlite:///%s" % database | ||
| if database := context.get_x_argument(as_dictionary=True).get('database'): | ||
| ini_section['sqlalchemy.url'] = f"sqlite:///{database}" |
There was a problem hiding this comment.
Function run_migrations_online refactored with the following changes:
- Use named expression to simplify assignment and conditional (
use-named-expression) - Replace interpolated string formatting with f-string (
replace-interpolation-with-fstring)
This removes the following comments ( why? ):
# if a database path was provided, override the one in alembic.ini
| triggers = [] | ||
| for each in newplug.init(): | ||
| triggers.append(each) | ||
| triggers = list(newplug.init()) |
There was a problem hiding this comment.
Function initplugins refactored with the following changes:
- Convert for loop into list comprehension (
list-comprehension) - Replace identity comprehension with call to collection constructor (
identity-comprehension)
Comment on lines
-111
to
+115
| '-x', 'database=%s' % options.database, '--raiseerr', | ||
| 'upgrade', 'head', | ||
| '-x', | ||
| f'database={options.database}', | ||
| '--raiseerr', | ||
| 'upgrade', | ||
| 'head', |
There was a problem hiding this comment.
Function createorupdatedb refactored with the following changes:
- Replace interpolated string formatting with f-string (
replace-interpolation-with-fstring)
Comment on lines
-194
to
+200
| if "```" in text: | ||
| markdown = True | ||
| else: | ||
| markdown = False | ||
|
|
||
| texto = string.join(lines[0:maxlines], "\n") | ||
| markdown = "```" in text | ||
| texto = string.join(lines[:maxlines], "\n") | ||
| if markdown: | ||
| texto = "%s```" % texto | ||
| texto = f"{texto}```" |
There was a problem hiding this comment.
Function sendmessage refactored with the following changes:
- Use named expression to simplify assignment and conditional (
use-named-expression) - Replace if statement with if expression (
assign-if-exp) - Replace interpolated string formatting with f-string [×6] (
replace-interpolation-with-fstring) - Replace a[0:x] with a[:x] and a[x:len(a)] with a[x:] (
remove-redundant-slice-index) - Simplify boolean if expression (
boolean-if-exp-identity) - Remove unnecessary casts to int, str, float or bool (
remove-unnecessary-cast)
stampy/stampy.py
Outdated
| # If we're not admin and admin is empty, consider ourselves admin | ||
| if not admin: | ||
| if plugin.config.config(key='admin', gid=chat_id, default="") == "": | ||
| if plugin.config.config(key='admin', gid=chat_id, default="") == "": | ||
| if not admin: |
There was a problem hiding this comment.
Function is_owner_or_admin refactored with the following changes:
- Swap positions of nested conditionals (
swap-nested-ifs)
This removes the following comments ( why? ):
# If we're not admin and admin is empty, consider ourselves admin
stampy/stampy.py
Outdated
Comment on lines
943
to
949
| if plugin.config.gconfig(key='isolated', default=False, gid=gid): | ||
| # Isolated is defined for either channel or general bot config. | ||
| # need to check now if group is linked and if so, return that gid, | ||
| # and if not, return groupid | ||
|
|
||
| link = plugin.config.gconfig(key='link', default=False, gid=gid) | ||
| if link: | ||
| # This chat_id has 'link' defined against master, effective gid | ||
| # should be that one | ||
| return int(link) | ||
| else: | ||
| return gid | ||
| else: | ||
| if not plugin.config.gconfig(key='isolated', default=False, gid=gid): | ||
| # Non isolation configured, returning '0' as gid to use | ||
| return 0 | ||
| if link := plugin.config.gconfig(key='link', default=False, gid=gid): | ||
| # This chat_id has 'link' defined against master, effective gid | ||
| # should be that one | ||
| return int(link) | ||
| else: | ||
| return gid |
There was a problem hiding this comment.
Function geteffectivegid refactored with the following changes:
- Swap if/else branches (
swap-if-else-branches) - Remove unnecessary else after guard condition (
remove-unnecessary-else) - Use named expression to simplify assignment and conditional (
use-named-expression)
This removes the following comments ( why? ):
# Isolated is defined for either channel or general bot config.
# and if not, return groupid
# need to check now if group is linked and if so, return that gid,
| triggers = ["^/admin"] | ||
| return triggers | ||
| return ["^/admin"] |
There was a problem hiding this comment.
Function init refactored with the following changes:
- Inline variable that is immediately returned (
inline-immediately-returned-variable)
Comment on lines
-28
to
+27
| def run(message): # do not edit this line | ||
| def run(message): # do not edit this line |
There was a problem hiding this comment.
Function run refactored with the following changes:
- Replace a[0:x] with a[:x] and a[x:len(a)] with a[x:] (
remove-redundant-slice-index)
stampy/plugin/admin.py
Outdated
Comment on lines
92
to
91
| token = texto.split(' ')[3] | ||
| if token: | ||
| if token := texto.split(' ')[3]: |
There was a problem hiding this comment.
Function admincommands refactored with the following changes:
- Use named expression to simplify assignment and conditional (
use-named-expression)
sourcery-ai-bot
commented
May 22, 2023
Comment on lines
-123
to
+122
| token = ''.join((random.choice(charset)) for x in range(size)) | ||
| generatedtoken = "%s:%s" % (chat_id, token) | ||
| token = ''.join((random.choice(charset)) for _ in range(size)) | ||
| generatedtoken = f"{chat_id}:{token}" |
There was a problem hiding this comment.
Function changenmastertoken refactored with the following changes:
- Replace unused for index with underscore (
for-index-underscore) - Replace interpolated string formatting with f-string (
replace-interpolation-with-fstring)
stampy/plugin/admin.py
Outdated
| masterid = stampy.plugin.config.config(key='link', default=False, gid=chat_id) | ||
|
|
||
| if masterid: | ||
| if masterid := stampy.plugin.config.config( | ||
| key='link', default=False, gid=chat_id | ||
| ): |
There was a problem hiding this comment.
Function chanunlink refactored with the following changes:
- Use named expression to simplify assignment and conditional (
use-named-expression)
stampy/plugin/admin.py
Outdated
Comment on lines
245
to
250
| masterid = stampy.plugin.config.config(key='link', default=False, gid=chat_id) | ||
|
|
||
| if masterid: | ||
| if masterid := stampy.plugin.config.config( | ||
| key='link', default=False, gid=chat_id | ||
| ): | ||
| # We've a master channel, report it | ||
| text = _("This channel %s is slave of channel %s") % (chat_id, masterid) | ||
| else: | ||
| # We nee to check database to see if we've any slave | ||
| sql = "SELECT id from config where key='link' and value='%s'" % chat_id | ||
| sql = f"SELECT id from config where key='link' and value='{chat_id}'" |
There was a problem hiding this comment.
Function chanshowslave refactored with the following changes:
- Use named expression to simplify assignment and conditional (
use-named-expression) - Replace interpolated string formatting with f-string (
replace-interpolation-with-fstring)
| triggers = ["^/alias"] | ||
| return triggers | ||
| return ["^/alias"] |
There was a problem hiding this comment.
Function init refactored with the following changes:
- Inline variable that is immediately returned (
inline-immediately-returned-variable)
Comment on lines
-27
to
+26
| def run(message): # do not edit this line | ||
| def run(message): # do not edit this line |
There was a problem hiding this comment.
Function run refactored with the following changes:
- Use named expression to simplify assignment and conditional (
use-named-expression) - Replace a[0:x] with a[:x] and a[x:len(a)] with a[x:] (
remove-redundant-slice-index)
| triggers = ["^/quit"] | ||
| return triggers | ||
| return ["^/quit"] |
There was a problem hiding this comment.
Function init refactored with the following changes:
- Inline variable that is immediately returned (
inline-immediately-returned-variable)
Comment on lines
-24
to
+23
| def run(message): # do not edit this line | ||
| def run(message): # do not edit this line |
There was a problem hiding this comment.
Function run refactored with the following changes:
- Replace a[0:x] with a[:x] and a[x:len(a)] with a[x:] (
remove-redundant-slice-index)
| triggers = ["^/cn"] | ||
| return triggers | ||
| return ["^/cn"] |
There was a problem hiding this comment.
Function init refactored with the following changes:
- Inline variable that is immediately returned (
inline-immediately-returned-variable)
stampy/plugin/chuck.py
Outdated
Comment on lines
27
to
32
| def run(message): # do not edit this line | ||
| def run(message): # do not edit this line | ||
| """ | ||
| Executes plugin | ||
| :param message: message to run against | ||
| :return: | ||
| """ | ||
| text = stampy.stampy.getmsgdetail(message)["text"] | ||
| if text: | ||
| if text := stampy.stampy.getmsgdetail(message)["text"]: |
There was a problem hiding this comment.
Function run refactored with the following changes:
- Use named expression to simplify assignment and conditional (
use-named-expression)
Comment on lines
-40
to
+46
| def help(message): # do not edit this line | ||
| def help(message): # do not edit this line | ||
| """ | ||
| Returns help for plugin | ||
| :param message: message to process | ||
| :return: help text | ||
| """ | ||
| commandtext = _("Use `/cn <word>` to get a random Chuck Norris quote based on word\n\n") | ||
| return commandtext | ||
| return _( | ||
| "Use `/cn <word>` to get a random Chuck Norris quote based on word\n\n" | ||
| ) |
There was a problem hiding this comment.
Function help refactored with the following changes:
- Inline variable that is immediately returned (
inline-immediately-returned-variable)
sourcery-ai-bot
commented
May 22, 2023
Comment on lines
-66
to
+65
| logger.debug(msg=_L("Command: %s by %s" % (texto, who_un))) | ||
| logger.debug(msg=_L(f"Command: {texto} by {who_un}")) |
There was a problem hiding this comment.
Function cn refactored with the following changes:
- Replace interpolated string formatting with f-string [×2] (
replace-interpolation-with-fstring) - Replace if statement with if expression (
assign-if-exp)
| triggers = ["*"] | ||
|
|
||
| return triggers | ||
| return ["*"] |
There was a problem hiding this comment.
Function init refactored with the following changes:
- Inline variable that is immediately returned (
inline-immediately-returned-variable)
Comment on lines
-35
to
+33
| def run(message): # do not edit this line | ||
| def run(message): # do not edit this line |
There was a problem hiding this comment.
Function run refactored with the following changes:
- Use f-string instead of string concatenation [×4] (
use-fstring-for-concatenation) - Replace interpolated string formatting with f-string (
replace-interpolation-with-fstring)
Comment on lines
-100
to
+104
| def help(message): # do not edit this line | ||
| def help(message): # do not edit this line | ||
| """ | ||
| Returns help for plugin | ||
| :param message: message to process | ||
| :return: help text | ||
| """ | ||
| commandtext = "" | ||
| return commandtext | ||
| return "" |
There was a problem hiding this comment.
Function help refactored with the following changes:
- Inline variable that is immediately returned (
inline-immediately-returned-variable)
| triggers.extend(["/%s" % comic]) | ||
| triggers.extend([f"/{comic}"]) |
There was a problem hiding this comment.
Function init refactored with the following changes:
- Replace interpolated string formatting with f-string (
replace-interpolation-with-fstring)
| triggers = ["^/espp"] | ||
| return triggers | ||
| return ["^/espp"] |
There was a problem hiding this comment.
Function init refactored with the following changes:
- Inline variable that is immediately returned (
inline-immediately-returned-variable)
stampy/plugin/espp.py
Outdated
Comment on lines
27
to
33
| def run(message): # do not edit this line | ||
| def run(message): # do not edit this line | ||
| """ | ||
| Executes plugin | ||
| :param message: message to run against | ||
| :return: | ||
| """ | ||
| text = stampy.stampy.getmsgdetail(message)["text"] | ||
| if text: | ||
| if text.split()[0].lower()[0:5] == "/espp": | ||
| if text := stampy.stampy.getmsgdetail(message)["text"]: | ||
| if text.split()[0].lower()[:5] == "/espp": |
There was a problem hiding this comment.
Function run refactored with the following changes:
- Use named expression to simplify assignment and conditional (
use-named-expression) - Replace a[0:x] with a[:x] and a[x:len(a)] with a[x:] (
remove-redundant-slice-index)
Comment on lines
-40
to
+44
| def help(message): # do not edit this line | ||
| def help(message): # do not edit this line | ||
| """ | ||
| Returns help for plugin | ||
| :param message: message to process | ||
| :return: help text | ||
| """ | ||
| commandtext = _("Use `/espp <amount>` to get estimated ESPP earnings\n\n") | ||
| return commandtext | ||
| return _("Use `/espp <amount>` to get estimated ESPP earnings\n\n") |
There was a problem hiding this comment.
Function help refactored with the following changes:
- Inline variable that is immediately returned (
inline-immediately-returned-variable)
stampy/plugin/espp.py
Outdated
Comment on lines
85
to
84
| initial = float(stampy.plugin.config.gconfig(key="espp", default=False, gid=chat_id)) | ||
| if initial: | ||
| if initial := float( | ||
| stampy.plugin.config.gconfig(key="espp", default=False, gid=chat_id) | ||
| ): |
There was a problem hiding this comment.
Function espp refactored with the following changes:
- Use named expression to simplify assignment and conditional (
use-named-expression) - Replace if statement with if expression (
assign-if-exp) - Replace comparison with min/max call (
min-max-identity)
Comment on lines
-32
to
+35
| triggers = ["^/feed"] | ||
|
|
||
| if botname == 'redken_bot': | ||
| stampy.stampy.cronme(name="feed", interval=5) | ||
|
|
||
| return triggers | ||
| return ["^/feed"] |
There was a problem hiding this comment.
Function init refactored with the following changes:
- Move assignment closer to its usage within a block (
move-assign-in-block) - Inline variable that is immediately returned (
inline-immediately-returned-variable)
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.
Thanks for starring sourcery-ai/sourcery ✨ 🌟 ✨
Here's your pull request refactoring your most popular Python repo.
If you want Sourcery to refactor all your Python repos and incoming pull requests install our bot.
Review changes via command line
To manually merge these changes, make sure you're on the
masterbranch, then run: