Sourcery Starbot ⭐ refactored PredaaA/predacogs #58

SourceryAI · 2021-03-17T23:03:33Z

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 master branch, then run:

git fetch https://github.com/sourcery-ai-bot/predacogs master
git merge --ff-only FETCH_HEAD
git reset HEAD^

SourceryAI · 2021-03-17T23:03:34Z

dbltools/dbltools.py

-        if not member.guild.id == config["support_server_role"]["guild_id"]:
+        if member.guild.id != config["support_server_role"]["guild_id"]:


Function DblTools.on_member_join refactored with the following changes:

Simplify logical expression using De Morgan identities (de-morgan)

SourceryAI · 2021-03-17T23:03:34Z

dbltools/dbltools.py

-            votes.append((user if user else user_id, humanize_number(value)))
+            votes.append((user or user_id, humanize_number(value)))


Function DblTools.listdblvotes refactored with the following changes:

Simplify if expression by using or (or-if-exp-identity)

SourceryAI · 2021-03-17T23:03:34Z

dbltools/utils.py

-    return True if datetime.today().weekday() in [4, 5, 6] else False
+    return datetime.today().weekday() in [4, 5, 6]


Function check_weekend refactored with the following changes:

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

SourceryAI · 2021-03-17T23:03:34Z

dbltoolslite/dbltools.py

-            votes.append((user if user else user_id, humanize_number(value)))
+            votes.append((user or user_id, humanize_number(value)))


Function DblToolsLite.listdblvotes refactored with the following changes:

Simplify if expression by using or (or-if-exp-identity)

SourceryAI · 2021-03-17T23:03:35Z

fivem/fivem.py

-            if ctx.channel.permissions_for(ctx.me).embed_links:
-                em = discord.Embed(
-                    color=await ctx.embed_colour(), title=f"FiveM settings for {self.bot.user}"
-                )
-                msg = ""
-                for attr, name in settings_name.items():
-                    if attr == "toggled":
-                        if settings[attr]:
-                            msg += f"**{name}** Yes\n"
-                        else:
-                            msg += f"**{name}** No\n"
-                    elif attr == "ip":
-                        if settings[attr]:
-                            msg += f"**{name}** {inline(settings[attr])}\n"
-                        else:
-                            msg += f"**{name}** Not set\n"
-                    elif attr == "text":
-                        if settings[attr]:
-                            msg += f"**{name}**\n{inline(settings[attr])}\n"
-                        else:
-                            msg += f"**{name}** Not set\n"
-                    elif attr == "streamer":
-                        if settings[attr]:
-                            msg += f"**{name}** {inline(settings[attr])}\n"
-                        else:
-                            msg += f"**{name}** Not set\n"
-                    elif attr == "stream_title":
-                        if settings[attr]:
-                            msg += f"**{name}** {inline(settings[attr])}\n"
-                        else:
-                            msg += f"**{name}** Not set\n"
-                    else:
+            msg = ""
+            for attr, name in settings_name.items():
+                if attr in ["ip", "streamer", "stream_title"]:
+                    if settings[attr]:
                        msg += f"**{name}** {inline(settings[attr])}\n"
-                em.description = msg
-                await ctx.send(embed=em)
-            else:
-                msg = "```\n"
-                for attr, name in settings_name.items():
-                    if attr == "toggled":
-                        if settings[attr]:
-                            msg += f"{name} Yes\n"
-                        else:
-                            msg += f"{name} No\n"
-                    elif attr == "ip":
-                        if settings[attr]:
-                            msg += f"{name} {settings[attr]}\n"
-                        else:
-                            msg += f"{name} Not set\n"
-                    elif attr == "text":
-                        if settings[attr]:
-                            msg += f"{name}\n{settings[attr]}\n"
-                        else:
-                            msg += f"{name} Not set\n"
-                    elif attr == "streamer":
-                        if settings[attr]:
-                            msg += f"{name} {settings[attr]}\n"
-                        else:
-                            msg += f"**{name}** Not set\n"
-                    elif attr == "stream_title":
-                        if settings[attr]:
-                            msg += f"{name} {settings[attr]}\n"
-                        else:
-                            msg += f"{name} Not set\n"
                    else:
+                        msg += f"**{name}** Not set\n"
+                elif attr == "text":
+                    if settings[attr]:
+                        msg += f"**{name}**\n{inline(settings[attr])}\n"
+                    else:
+                        msg += f"**{name}** Not set\n"
+                elif attr == "toggled":
+                    msg += f"**{name}** Yes\n" if settings[attr] else f"**{name}** No\n"
+                else:
+                    msg += f"**{name}** {inline(settings[attr])}\n"
+            em.description = msg
+            await ctx.send(embed=em)
+        else:
+            msg = "```\n"
+            for attr, name in settings_name.items():
+                if attr in ["ip", "stream_title"]:
+                    msg += f"{name} {settings[attr]}\n" if settings[attr] else f"{name} Not set\n"
+                elif attr == "streamer":
+                    if settings[attr]:
                        msg += f"{name} {settings[attr]}\n"
-                msg += "```"
-                await ctx.send(msg)
+                    else:
+                        msg += f"**{name}** Not set\n"
+                elif attr == "text":
+                    msg += f"{name}\n{settings[attr]}\n" if settings[attr] else f"{name} Not set\n"
+                elif attr == "toggled":
+                    msg += f"{name} Yes\n" if settings[attr] else f"{name} No\n"
+                else:
+                    msg += f"{name} {settings[attr]}\n"
+            msg += "```"
+            await ctx.send(msg)


Function FiveM.fivemset refactored with the following changes:

Simplify conditional into switch-like form (switch)

Add guard clause (last-if-guard)

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

SourceryAI · 2021-03-17T23:03:37Z

spacex/core.py

-        description = (
+        return (


Function Core._about_cog._launchpads_texts refactored with the following changes:

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

SourceryAI · 2021-03-17T23:03:37Z

spacex/core.py

-        description = (
+        return (
            "Status: **{status}**\n"
            "Landing type: **{landing_t}**\n"
            "Attempted landings: **{att_lands}**\n"
            "Success landings: **{succ_lands}**\n"
            "Location: **{location}**"
        ).format(**description_kwargs)
-        return description


Function Core._about_cog._landpads_texts refactored with the following changes:

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

SourceryAI · 2021-03-17T23:03:37Z

spacex/core.py

-        description = (
+        return (
            data["description"]
            + "\n**[Wikipedia page]({})**".format(data["wikipedia"])
            + "{website}{twitter}"
        ).format(**description_kwargs)
-        return description


Function Core._about_cog._missions_texts refactored with the following changes:

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

SourceryAI · 2021-03-17T23:03:37Z

spacex/core.py

-        roadster_stats = (
+        return (
            "Launch date: **{launch_date} {ago} ago**\n"
            "Launch mass: **{mass_kg:,} kg / {mass_lbs:,} lbs**\n"
            "Actual speed: **{speed_km:,} km/h / {speed_mph:,} mph**\n"
            "Earth distance: **{e_distance_km:,} km / {e_distance_mi:,} mi**\n"
            "Mars distance: **{m_distance_km:,} km / {m_distance_mi:,} mi**\n"
        ).format(**roadster_stats_kwargs)
-        return roadster_stats


Function Core._about_cog._roadster_texts refactored with the following changes:

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

SourceryAI · 2021-03-17T23:03:37Z

spacex/core.py

-        payload_weights_stats = ""
-        for p in data["payload_weights"]:
-            payload_weights_stats += (
-                "Name: **{p_name}**\n" "Weight: **{kg_mass:,} kg / {lb_mass:,} lbs**\n"
+        payload_weights_stats = "".join(
+            (
+                "Name: **{p_name}**\n"
+                "Weight: **{kg_mass:,} kg / {lb_mass:,} lbs**\n"
            ).format(p_name=p["name"], kg_mass=p["kg"], lb_mass=p["lb"])
+            for p in data["payload_weights"]
+        )
+


Function Core._about_cog._rockets_texts refactored with the following changes:

Use str.join() instead of for loop (use-join)

Motzumoto · 2024-01-26T04:04:20Z

I dont entirely suggest using sourcery since it will push breaking changes with little to no testing.

SourceryAI commented Mar 17, 2021

View reviewed changes

SourceryAI force-pushed the master branch from ddacb20 to c9847d3 Compare March 21, 2021 00:12

'Refactored by Sourcery'

5872a09

SourceryAI force-pushed the master branch from c9847d3 to 5872a09 Compare March 21, 2021 00:23

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sourcery Starbot ⭐ refactored PredaaA/predacogs #58

Sourcery Starbot ⭐ refactored PredaaA/predacogs #58

SourceryAI commented Mar 17, 2021

SourceryAI Mar 17, 2021

SourceryAI Mar 17, 2021

SourceryAI Mar 17, 2021

SourceryAI Mar 17, 2021

SourceryAI Mar 17, 2021

SourceryAI Mar 17, 2021

SourceryAI Mar 17, 2021

SourceryAI Mar 17, 2021

SourceryAI Mar 17, 2021

SourceryAI Mar 17, 2021

Motzumoto commented Jan 26, 2024

		if not member.guild.id == config["support_server_role"]["guild_id"]:
		if member.guild.id != config["support_server_role"]["guild_id"]:

		votes.append((user if user else user_id, humanize_number(value)))
		votes.append((user or user_id, humanize_number(value)))

		return True if datetime.today().weekday() in [4, 5, 6] else False
		return datetime.today().weekday() in [4, 5, 6]

Sourcery Starbot ⭐ refactored PredaaA/predacogs #58

Are you sure you want to change the base?

Sourcery Starbot ⭐ refactored PredaaA/predacogs #58

Conversation

SourceryAI commented Mar 17, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Motzumoto commented Jan 26, 2024