Sourcery refactored main branch by sourcery-ai[bot] · Pull Request #1 · amanqs/FileSharing

sourcery-ai · 2023-03-04T12:48:34Z

Branch main refactored 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 main branch, then run:

git fetch origin sourcery/main
git merge --ff-only FETCH_HEAD
git reset HEAD^

Help us improve this pull request!

sourcery-ai · 2023-03-04T12:48:47Z

Sourcery Code Quality Report

❌ Merging this PR will decrease code quality in the affected files by 0.05%.

Quality metrics	Before	After	Change
Complexity	7.09 ⭐	6.76 ⭐	-0.33 👍
Method Length	90.86 🙂	89.14 🙂	-1.72 👍
Working memory	7.59 🙂	7.85 🙂	0.26 👎
Quality	66.25% 🙂	66.20% 🙂	-0.05% 👎

Other metrics	Before	After	Change
Lines	402	402	0

Changed files	Quality Before	Quality After	Quality Change
helper_func.py	76.74% ⭐	76.55% ⭐	-0.19% 👎
plugins/button.py	56.02% 🙂	55.99% 🙂	-0.03% 👎
plugins/heroku.py	56.68% 🙂	56.21% 🙂	-0.47% 👎
plugins/updater.py	69.95% 🙂	69.73% 🙂	-0.22% 👎

Here are some functions in these files that still need a tune-up:

File	Function	Complexity	Length	Working Memory	Quality	Recommendation
plugins/updater.py	gen_chlog	2 ⭐	156 😞	19 ⛔	48.68% 😞	Try splitting into smaller methods. Extract out complex expressions
plugins/heroku.py	varget_	13 🙂	155 😞	10 😞	50.02% 🙂	Try splitting into smaller methods. Extract out complex expressions
plugins/button.py	fsub_button	11 🙂	169 😞	10 😞	50.41% 🙂	Try splitting into smaller methods. Extract out complex expressions
plugins/heroku.py	set_var	13 🙂	197 😞	8 🙂	50.53% 🙂	Try splitting into smaller methods
helper_func.py	get_message_id	13 🙂	103 🙂	11 😞	54.32% 🙂	Extract out complex expressions

Legend and Explanation

The emojis denote the absolute quality of the code:

⭐ excellent
🙂 good
😞 poor
⛔ very poor

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!

sourcery-ai · 2023-04-12T14:26:28Z

config.py

-HEROKU_APP_NAME = os.environ.get("HEROKU_APP_NAME", None)
-HEROKU_API_KEY = os.environ.get("HEROKU_API_KEY", None)
+HEROKU_APP_NAME = os.environ.get("HEROKU_APP_NAME")
+HEROKU_API_KEY = os.environ.get("HEROKU_API_KEY")


Lines 32-64 refactored with the following changes:

Replace dict.get(x, None) with dict.get(x) [×3] (remove-none-from-default-get)

sourcery-ai · 2023-04-12T14:26:28Z

helper_func.py

    base64_bytes = base64.urlsafe_b64encode(string_bytes)
-    base64_string = (base64_bytes.decode("ascii")).strip("=")
-    return base64_string
+    return (base64_bytes.decode("ascii")).strip("=")


Function encode refactored with the following changes:

Inline variable that is immediately returned (inline-immediately-returned-variable)

sourcery-ai · 2023-04-12T14:26:29Z

helper_func.py

-    string = string_bytes.decode("ascii")
-    return string
+    string_bytes = base64.urlsafe_b64decode(base64_bytes)
+    return string_bytes.decode("ascii")


Function decode refactored with the following changes:

Inline variable that is immediately returned (inline-immediately-returned-variable)

sourcery-ai · 2023-04-12T14:26:29Z

helper_func.py

-        channel_id = matches.group(1)
-        msg_id = int(matches.group(2))
+        channel_id = matches[1]
+        msg_id = int(matches[2])


Function get_message_id refactored with the following changes:

Replace m.group(x) with m[x] for re.Match objects [×2] (use-getitem-for-re-match-groups)

sourcery-ai · 2023-04-12T14:26:29Z

plugins/button.py

-    if not FORCE_SUB_CHANNEL and not FORCE_SUB_GROUP:
-        buttons = [
+    if not FORCE_SUB_CHANNEL:
+        return (
            [
-                InlineKeyboardButton(text="ʜᴇʟᴘ & ᴄᴏᴍᴍᴀɴᴅs", callback_data="help"),
-                InlineKeyboardButton(text="ᴛᴜᴛᴜᴘ", callback_data="close"),
-            ],
-        ]
-        return buttons
-    if not FORCE_SUB_CHANNEL and FORCE_SUB_GROUP:
-        buttons = [
-            [
-                InlineKeyboardButton(text="ɢʀᴏᴜᴘ", url=client.invitelink2),
-            ],
-            [
-                InlineKeyboardButton(text="ʜᴇʟᴘ & ᴄᴏᴍᴍᴀɴᴅs", callback_data="help"),
-                InlineKeyboardButton(text="ᴛᴜᴛᴜᴘ", callback_data="close"),
-            ],
-        ]
-        return buttons
-    if FORCE_SUB_CHANNEL and not FORCE_SUB_GROUP:
-        buttons = [
+                [
+                    InlineKeyboardButton(text="ɢʀᴏᴜᴘ", url=client.invitelink2),
+                ],
+                [
+                    InlineKeyboardButton(
+                        text="ʜᴇʟᴘ & ᴄᴏᴍᴍᴀɴᴅs", callback_data="help"
+                    ),
+                    InlineKeyboardButton(text="ᴛᴜᴛᴜᴘ", callback_data="close"),
+                ],
+            ]
+            if FORCE_SUB_GROUP
+            else [
+                [
+                    InlineKeyboardButton(
+                        text="ʜᴇʟᴘ & ᴄᴏᴍᴍᴀɴᴅs", callback_data="help"
+                    ),
+                    InlineKeyboardButton(text="ᴛᴜᴛᴜᴘ", callback_data="close"),
+                ],
+            ]
+        )
+    if not FORCE_SUB_GROUP:
+        return [
            [
                InlineKeyboardButton(text="ᴄʜᴀɴɴᴇʟ", url=client.invitelink),
            ],
            [
-                InlineKeyboardButton(text="ʜᴇʟᴘ & ᴄᴏᴍᴍᴀɴᴅs", callback_data="help"),
+                InlineKeyboardButton(
+                    text="ʜᴇʟᴘ & ᴄᴏᴍᴍᴀɴᴅs", callback_data="help"
+                ),
                InlineKeyboardButton(text="ᴛᴜᴛᴜᴘ", callback_data="close"),
            ],
        ]
-        return buttons
-    if FORCE_SUB_CHANNEL and FORCE_SUB_GROUP:
-        buttons = [
+    if FORCE_SUB_CHANNEL:
+        return [
            [
-                InlineKeyboardButton(text="ʜᴇʟᴘ & ᴄᴏᴍᴍᴀɴᴅs", callback_data="help"),
+                InlineKeyboardButton(
+                    text="ʜᴇʟᴘ & ᴄᴏᴍᴍᴀɴᴅs", callback_data="help"
+                ),


Function start_button refactored with the following changes:

Hoist a repeated condition into a parent condition (hoist-repeated-if-condition)

Remove redundant conditional [×3] (remove-redundant-if)

Lift code into else after jump in control flow (reintroduce-else)

Hoist nested repeated code outside conditional statements (hoist-similar-statement-from-if)

Inline variable that is immediately returned [×4] (inline-immediately-returned-variable)

Swap if/else branches of if expression to remove negation (swap-if-expression)

Swap positions of nested conditionals (swap-nested-ifs)

Replace if statement with if expression (assign-if-exp)

sourcery-ai · 2023-04-12T14:26:30Z

plugins/button.py

-    if FORCE_SUB_CHANNEL and FORCE_SUB_GROUP:
+    if FORCE_SUB_CHANNEL:


Function fsub_button refactored with the following changes:

Remove redundant conditional (remove-redundant-if)

sourcery-ai · 2023-04-12T14:26:30Z

plugins/heroku.py

-        output = dotenv.get_key(path, check_var)
-        if not output:
-            await message.reply_text(f"Tidak dapat menemukan var {check_var}")
-        else:
+        if output := dotenv.get_key(path, check_var):
            return await message.reply_text(
                f"<b>{check_var}:</b> <code>{str(output)}</code>"
            )
+        else:
+            await message.reply_text(f"Tidak dapat menemukan var {check_var}")


Function varget_ refactored with the following changes:

Use named expression to simplify assignment and conditional (use-named-expression)

Swap if/else branches (swap-if-else-branches)

sourcery-ai · 2023-04-12T14:26:30Z

plugins/heroku.py

-        if check_var in heroku_config:
-            await message.reply_text(f"Berhasil Menghapus var {check_var}")
-            del heroku_config[check_var]
-        else:
+        if check_var not in heroku_config:
            return await message.reply_text(f"Tidak dapat menemukan var {check_var}")
+        await message.reply_text(f"Berhasil Menghapus var {check_var}")
+        del heroku_config[check_var]


Function vardel_ refactored with the following changes:

Swap if/else branches [×3] (swap-if-else-branches)

Remove unnecessary else after guard condition [×2] (remove-unnecessary-else)

sourcery-ai · 2023-04-12T14:26:30Z

plugins/updater.py

    msg = await message.reply_text("Checking updates...")
-    update_avail = updater()
-    if update_avail:
+    if update_avail := updater():


Function update_bot refactored with the following changes:

Use named expression to simplify assignment and conditional (use-named-expression)

sourcery-ai bot requested a review from amanqs March 4, 2023 12:48

'Refactored by Sourcery'

33bf236

sourcery-ai bot force-pushed the sourcery/main branch from 0cb9574 to 33bf236 Compare April 12, 2023 14:26

sourcery-ai bot commented Apr 12, 2023

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sourcery refactored main branch#1

Sourcery refactored main branch#1
sourcery-ai[bot] wants to merge 1 commit intomainfrom
sourcery/main

sourcery-ai bot commented Mar 4, 2023

Uh oh!

sourcery-ai bot commented Mar 4, 2023

Uh oh!

sourcery-ai bot Apr 12, 2023

Uh oh!

sourcery-ai bot Apr 12, 2023

Uh oh!

sourcery-ai bot Apr 12, 2023

Uh oh!

sourcery-ai bot Apr 12, 2023

Uh oh!

sourcery-ai bot Apr 12, 2023

Uh oh!

sourcery-ai bot Apr 12, 2023

Uh oh!

sourcery-ai bot Apr 12, 2023

Uh oh!

sourcery-ai bot Apr 12, 2023

Uh oh!

sourcery-ai bot Apr 12, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

0 participants

		if FORCE_SUB_CHANNEL and FORCE_SUB_GROUP:
		if FORCE_SUB_CHANNEL:

Conversation

sourcery-ai bot commented Mar 4, 2023

Uh oh!

sourcery-ai bot commented Mar 4, 2023

Sourcery Code Quality Report

Legend and Explanation

Uh oh!

sourcery-ai bot Apr 12, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Apr 12, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Apr 12, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Apr 12, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Apr 12, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Apr 12, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Apr 12, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Apr 12, 2023

Choose a reason for hiding this comment

Uh oh!

sourcery-ai bot Apr 12, 2023

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

0 participants