Sourcery refactored zeldrisdev branch #30
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}
Comment on lines
+379
to
+465
| reply_markup=keyboard, | ||
| ) | ||
| except BadRequest as excp: | ||
| if excp.message == "Unsupported url protocol": | ||
| try: | ||
| send_message( | ||
| update.effective_message, | ||
| "You seem to be trying to use an unsupported url protocol. " | ||
| "Telegram doesn't support buttons for some protocols, such as tg://. Please try " | ||
| "again...", | ||
| ) | ||
| except BadRequest as excp: | ||
| LOGGER.exception("Error in filters: " + excp.message) | ||
| elif excp.message == "Reply message not found": | ||
| try: | ||
| context.bot.send_message( | ||
| chat.id, | ||
| filt.reply, | ||
| parse_mode=ParseMode.MARKDOWN_V2, | ||
| reply_markup=keyboard, | ||
| ) | ||
| except BadRequest as excp: | ||
| LOGGER.exception("Error in filters: " + excp.message) | ||
| else: | ||
| try: | ||
| send_message( | ||
| update.effective_message, | ||
| "This message couldn't be sent as it's incorrectly formatted.", | ||
| ) | ||
| except BadRequest as excp: | ||
| LOGGER.exception("Error in filters: " + excp.message) | ||
| LOGGER.warning( | ||
| "Message %s could not be parsed", | ||
| str(filt.reply), | ||
| try: | ||
| send_message( | ||
| update.effective_message, | ||
| filt.reply, | ||
| parse_mode=ParseMode.MARKDOWN_V2, | ||
| reply_markup=keyboard, | ||
| ) | ||
| except BadRequest as excp: | ||
| if excp.message == "Unsupported url protocol": | ||
| try: | ||
| send_message( | ||
| update.effective_message, | ||
| "You seem to be trying to use an unsupported url protocol. " | ||
| "Telegram doesn't support buttons for some protocols, such as tg://. Please try " | ||
| "again...", | ||
| ) | ||
| except BadRequest as excp: | ||
| LOGGER.exception("Error in filters: " + excp.message) | ||
| elif excp.message == "Reply message not found": | ||
| try: | ||
| context.bot.send_message( | ||
| chat.id, | ||
| filt.reply, | ||
| parse_mode=ParseMode.MARKDOWN_V2, | ||
| reply_markup=keyboard, | ||
| ) | ||
| LOGGER.exception( | ||
| "Could not parse filter %s in chat %s", | ||
| str(filt.keyword), | ||
| str(chat.id), | ||
| except BadRequest as excp: | ||
| LOGGER.exception("Error in filters: " + excp.message) | ||
| else: | ||
| try: | ||
| send_message( | ||
| update.effective_message, | ||
| "This message couldn't be sent as it's incorrectly formatted.", | ||
| ) | ||
| except BadRequest as excp: | ||
| LOGGER.exception("Error in filters: " + excp.message) | ||
| LOGGER.warning( | ||
| "Message %s could not be parsed", | ||
| str(filt.reply), | ||
| ) | ||
| LOGGER.exception( | ||
| "Could not parse filter %s in chat %s", | ||
| str(filt.keyword), | ||
| str(chat.id), | ||
| ) | ||
|
|
||
| else: | ||
| # LEGACY - all new filters will have has_markdown set to | ||
| # True. | ||
| try: | ||
| send_message(update.effective_message, filt.reply) | ||
| except BadRequest as excp: | ||
| LOGGER.exception("Error in filters: " + excp.message) | ||
| break | ||
| else: | ||
| # LEGACY - all new filters will have has_markdown set to | ||
| # True. | ||
| try: | ||
| send_message(update.effective_message, filt.reply) | ||
| except BadRequest as excp: | ||
| LOGGER.exception("Error in filters: " + excp.message) | ||
| break |
There was a problem hiding this comment.
Function reply_filter refactored with the following changes:
- Hoist repeated code outside conditional statement (
hoist-statement-from-if) - Merge else clause's nested if statement into elif (
merge-else-if-into-elif)
Sourcery Code Quality Report✅ Merging this PR will increase code quality in the affected files by 0.45%.
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
zeldrisdevrefactored 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
zeldrisdevbranch, then run:Help us improve this pull request!