Sourcery refactored main branch #1

sourcery-ai · 2022-01-30T13:13:44Z

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 · 2022-01-30T13:13:46Z

spam/db/__init__.py

-        x = self.vanitas.find_one({"chat_id": chat_id})
-        if x:
-            return True
-        return False
+        return bool(x := self.vanitas.find_one({"chat_id": chat_id}))


Function DB.is_vanitas refactored with the following changes:

Simplify boolean if expression (boolean-if-exp-identity)

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

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

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

sourcery-ai · 2022-01-30T13:13:46Z

spam/db/__init__.py

-        set_vanitas = self.is_vanitas(chat_id)
-        if set_vanitas:
+        if set_vanitas := self.is_vanitas(chat_id):


Function DB.set_vanitas refactored with the following changes:

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

sourcery-ai · 2022-01-30T13:13:46Z

spam/db/__init__.py

-        x = self.sibyl.find_one({"chat_id": chat_id})
-        if x:
-            return True
-        return False
+        return bool(x := self.sibyl.find_one({"chat_id": chat_id}))


Function DB.is_sibyl refactored with the following changes:

Simplify boolean if expression (boolean-if-exp-identity)

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

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

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

sourcery-ai · 2022-01-30T13:13:46Z

spam/db/__init__.py

-        set_sibyl = self.is_sibyl(chat_id)
-        if set_sibyl:
+        if set_sibyl := self.is_sibyl(chat_id):


Function DB.set_sibyl refactored with the following changes:

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

sourcery-ai · 2022-01-30T13:13:46Z

spam/helper/__init__.py

-    return True if res['blacklisted'] else False
+    return bool(res['blacklisted'])


Function is_vanitasalert refactored with the following changes:

Simplify boolean if expression (boolean-if-exp-identity)

sourcery-ai · 2022-01-30T13:13:47Z

spam/modules/sibyl.py

-    is_sibyl = db.is_sibyl(message.chat.id)
-    if not is_sibyl:
-        db.set_sibyl(message.chat.id)
-        await message.reply_text("Sibyl Alert Enable")
-    else:
+    if is_sibyl := db.is_sibyl(message.chat.id):
        db.rm_sibyl(message.chat.id)
        await message.reply_text("Sibyl Alert Disable")


Function sibylalert 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 · 2022-01-30T13:13:47Z

spam/modules/sibyl.py

-    else:
-        pass


Function salert refactored with the following changes:

Remove redundant pass statement (remove-redundant-pass)

sourcery-ai · 2022-01-30T13:13:47Z

spam/modules/spam.py

-        if user_data.status == 'administrator' or user_data.status == 'creator':
-            return True
-        else:
-            return False
+        return user_data.status in ['administrator', 'creator']


Function is_admin refactored with the following changes:

Simplify boolean if expression (boolean-if-exp-identity)

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

Replace multiple comparisons of same variable with in operator (merge-comparisons)

sourcery-ai · 2022-01-30T13:13:47Z

spam/modules/vanitas.py

-    is_vanitas = db.is_vanitas(message.chat.id)
-    if not is_vanitas:
-        db.set_vanitas(message.chat.id)
-        await message.reply_text("Alert Mode Enable")
-    else:
+    if is_vanitas := db.is_vanitas(message.chat.id):
        db.rm_vanitas(message.chat.id)
        await message.reply_text("Alert Mode Disable")


Function vanitasalert 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 · 2022-01-30T13:13:47Z

spam/modules/vanitas.py

-    else:
-        pass


Function valert refactored with the following changes:

Remove redundant pass statement (remove-redundant-pass)

sourcery-ai · 2022-01-30T13:13:51Z

Sourcery Code Quality Report

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

Quality metrics	Before	After	Change
Complexity	2.99 ⭐	2.80 ⭐	-0.19 👍
Method Length	38.84 ⭐	38.10 ⭐	-0.74 👍
Working memory	6.66 🙂	6.76 🙂	0.10 👎
Quality	81.35% ⭐	81.20% ⭐	-0.15% 👎

Other metrics	Before	After	Change
Lines	249	232	-17

Changed files	Quality Before	Quality After	Quality Change
spam/db/init.py	94.02% ⭐	94.13% ⭐	0.11% 👍
spam/helper/init.py	85.59% ⭐	85.73% ⭐	0.14% 👍
spam/modules/sibyl.py	71.55% 🙂	72.27% 🙂	0.72% 👍
spam/modules/spam.py	71.44% 🙂	71.06% 🙂	-0.38% 👎
spam/modules/vanitas.py	71.76% 🙂	72.48% 🙂	0.72% 👍

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

File	Function	Complexity	Length	Working Memory	Quality	Recommendation
spam/modules/sibyl.py	salert	2 ⭐	97 🙂	13 😞	62.22% 🙂	Extract out complex expressions
spam/modules/vanitas.py	valert	2 ⭐	94 🙂	13 😞	62.64% 🙂	Extract out complex expressions
spam/modules/spam.py	kick_callback	3 ⭐	94 🙂	12 😞	63.21% 🙂	Extract out complex expressions
spam/modules/spam.py	ban_callback	3 ⭐	85 🙂	12 😞	64.50% 🙂	Extract out complex expressions
spam/modules/spam.py	mute_callback	3 ⭐	89 🙂	11 😞	65.66% 🙂	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!

'Refactored by Sourcery'

c90f68b

sourcery-ai bot requested a review from itspranavajay January 30, 2022 13:13

sourcery-ai bot commented Jan 30, 2022

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 commented Jan 30, 2022

sourcery-ai bot Jan 30, 2022

sourcery-ai bot Jan 30, 2022

sourcery-ai bot Jan 30, 2022

sourcery-ai bot Jan 30, 2022

sourcery-ai bot Jan 30, 2022

sourcery-ai bot Jan 30, 2022

sourcery-ai bot Jan 30, 2022

sourcery-ai bot Jan 30, 2022

sourcery-ai bot Jan 30, 2022

sourcery-ai bot Jan 30, 2022

sourcery-ai bot commented Jan 30, 2022

		return True if res['blacklisted'] else False
		return bool(res['blacklisted'])

Sourcery refactored main branch #1

Are you sure you want to change the base?

Sourcery refactored main branch #1

Conversation

sourcery-ai bot commented Jan 30, 2022

sourcery-ai bot Jan 30, 2022

Choose a reason for hiding this comment

sourcery-ai bot Jan 30, 2022

Choose a reason for hiding this comment

sourcery-ai bot Jan 30, 2022

Choose a reason for hiding this comment

sourcery-ai bot Jan 30, 2022

Choose a reason for hiding this comment

sourcery-ai bot Jan 30, 2022

Choose a reason for hiding this comment

sourcery-ai bot Jan 30, 2022

Choose a reason for hiding this comment

sourcery-ai bot Jan 30, 2022

Choose a reason for hiding this comment

sourcery-ai bot Jan 30, 2022

Choose a reason for hiding this comment

sourcery-ai bot Jan 30, 2022

Choose a reason for hiding this comment

sourcery-ai bot Jan 30, 2022

Choose a reason for hiding this comment

sourcery-ai bot commented Jan 30, 2022

Sourcery Code Quality Report

Legend and Explanation