Sourcery refactored master branch #1
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -48,8 +48,7 @@ async def _source( | |
| src = type(self.bot.help_command) | ||
| module = src.__module__ | ||
| filename = inspect.getsourcefile(src) | ||
| if help_command := self.bot.get_command("help"): | ||
|
There was a problem hiding this comment. Function
|
||
| embed.description = help_command.help.format(prefix=ctx.prefix) | ||
| else: | ||
| obj = self.bot.get_command(command.replace(".", " ")) | ||
|
|
@@ -97,7 +96,7 @@ async def define(self, ctx: commands.Context[CodingBot], *, word: str): | |
| return await ctx.send(f"Could not find definition for `{word}`") | ||
| definition = definition[0] | ||
| embed = discord.Embed( | ||
| title=f"Definition of {word}", | ||
|
Comment on lines
-100
to
+99
There was a problem hiding this comment. Function
|
||
| description=f"**Meaning**: {definition.meaning}\n", | ||
| color=discord.Color.random(), | ||
| ) | ||
|
|
||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -53,9 +53,7 @@ async def cog_check(self, ctx: commands.Context[CodingBot]) -> bool: | |
|
|
||
| official_helper_role = ctx.guild.get_role(OFFICIAL_HELPER_ROLE_ID) | ||
|
|
||
| return official_helper_role in ctx.author.roles | ||
|
There was a problem hiding this comment. Function
|
||
|
|
||
| async def capture_evidence( | ||
| self, ctx: commands.Context[CodingBot] | ||
|
|
@@ -175,8 +173,8 @@ async def log( | |
|
|
||
| embed = discord.Embed(color=color, timestamp=discord.utils.utcnow()) | ||
|
|
||
| embed.description = ( | ||
| f"{icon} **Action:** {action_string.title()}\n**Reason:** {reason}\n" | ||
|
Comment on lines
-178
to
+177
There was a problem hiding this comment. Function
|
||
| ) | ||
| if duration: | ||
| embed.description += "**Duration:** {}\n".format( | ||
|
|
@@ -272,12 +270,9 @@ async def help_warnings( | |
|
|
||
| for i, warning in enumerate(records, 1): | ||
| helper = ctx.guild.get_member(warning.helper_id) | ||
| helper = helper.mention if helper else "Unknown" | ||
| embed.add_field( | ||
| name=f"`{i}.` Reason: {warning.reason}", | ||
|
There was a problem hiding this comment. Function
|
||
| value=f"Issued by: {helper} - <t:{int(warning.date)}:f>", | ||
| inline=False, | ||
| ) | ||
|
|
||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -30,9 +30,7 @@ def valid_gh_sect(name: str): | |
| return False | ||
| if name.startswith("-") or name.endswith("-"): | ||
| return False | ||
| return name.replace("-", "").isalnum() | ||
|
There was a problem hiding this comment. Function
|
||
|
|
||
| self.valid_gh_sect = valid_gh_sect | ||
|
|
||
|
|
@@ -81,39 +79,39 @@ async def afk_user_messaage(self, message: discord.Message): | |
| record = self.bot.afk_cache.get(message.guild.id) | ||
| if record: | ||
| record = record.get(message.author.id) | ||
| if record: | ||
| _, time = record | ||
| if (datetime.utcnow() - datetime.utcfromtimestamp(time)).seconds < 30: | ||
| return | ||
| await self.bot.conn.delete_record( | ||
| "afk", | ||
| table="afk", | ||
| where=("user_id",), | ||
| values=(message.author.id,), | ||
| ) | ||
| try: | ||
| if "[AFK]" in message.author.display_name: | ||
| name = message.author.display_name.split(" ")[1:] | ||
| await message.author.edit(nick=" ".join(name)) | ||
| except (discord.HTTPException, discord.Forbidden): | ||
| pass | ||
|
|
||
| staff_role = message.guild.get_role(795145820210462771) | ||
| if staff_role and staff_role in message.author.roles: | ||
| on_pat_staff = message.guild.get_role(726441123966484600) | ||
| try: | ||
| await message.author.add_roles(on_pat_staff) | ||
| except (discord.Forbidden, discord.HTTPException): | ||
| pass | ||
| del self.bot.afk_cache[message.guild.id][message.author.id] | ||
| em = discord.Embed( | ||
| description=f"{message.author.mention} Welcome back, " | ||
| "I removed your AFK!", | ||
| color=discord.Color.dark_gold(), | ||
| ) | ||
| msg = await message.reply(embed=em) | ||
| await asyncio.sleep(5) | ||
| await msg.delete() | ||
|
Comment on lines
-84
to
+114
There was a problem hiding this comment. Function
|
||
|
|
||
| @commands.Cog.listener("on_message") | ||
| async def user_mentioned(self, message: discord.Message): | ||
|
|
@@ -134,14 +132,14 @@ async def user_mentioned(self, message: discord.Message): | |
| record = self.bot.afk_cache.get(message.guild.id) | ||
| if record: | ||
| record = record.get(member.id) | ||
| if record: | ||
| reason, time_ = record | ||
| em = discord.Embed( | ||
| description=f"{member.mention} is AFK: {reason} " | ||
| f"(<t:{time_}:R>)", | ||
| color=discord.Color.dark_blue(), | ||
| ) | ||
| await message.reply(embed=em) | ||
|
Comment on lines
-137
to
+142
There was a problem hiding this comment. Function
|
||
|
|
||
| @commands.Cog.listener() | ||
| async def on_message_edit( | ||
|
|
@@ -191,10 +189,7 @@ async def on_command_error(self, ctx: commands.Context, error: Exception) -> Non | |
| ) | ||
| return await ctx.send(embed=embed, ephemeral=True) | ||
| else: | ||
| print(f"Ignoring exception in command {ctx.command}:", file=sys.stderr) | ||
|
Comment on lines
-194
to
+192
There was a problem hiding this comment. Function
|
||
| traceback.print_exception( | ||
| type(error), error, error.__traceback__, file=sys.stderr | ||
| ) | ||
|
|
@@ -209,17 +204,17 @@ async def track_sent_message(self, message: discord.Message): | |
| return | ||
|
|
||
| values = [message.author.id, message.guild.id, 1, 1] | ||
| columns = [ | ||
| "user_id", | ||
| "guild_id", | ||
| "message_count", | ||
| status := message.author.status.name, | ||
| ] | ||
|
|
||
| staff_role = message.guild.get_role(TCR_STAFF_ROLE_ID) | ||
| if staff_role and staff_role in message.author.roles: # type: ignore | ||
| columns.append("is_staff") | ||
| values.append(1) | ||
|
Comment on lines
-212
to
-222
There was a problem hiding this comment. Function
|
||
| return await self.bot.conn.insert_record( | ||
| "metrics", | ||
| table="message_metric", | ||
|
|
||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -367,19 +367,16 @@ async def thank_leaderboard(self, ctx: commands.Context[CodingBot]): | |
| ctx, | ||
| check=lambda i: i.user.id == ctx.author.id, | ||
| ) | ||
| else: | ||
| paginator = pg.Paginator(self.bot, embeds, ctx) | ||
| paginator.add_button("back", emoji="◀️") | ||
| paginator.add_button("goto", style=discord.ButtonStyle.primary) | ||
| paginator.add_button("next", emoji="▶️") | ||
|
|
||
| paginator.add_button( | ||
| "delete", label="Delete", style=discord.ButtonStyle.danger | ||
| ) | ||
| await paginator.start() | ||
|
Comment on lines
-370
to
+379
There was a problem hiding this comment. Function
|
||
|
|
||
| @commands.hybrid_group(invoke_without_command=True) | ||
| async def trainee(self, ctx: commands.Context[CodingBot]): | ||
|
|
@@ -400,14 +397,12 @@ async def trainee_list(self, ctx: commands.Context[CodingBot]): | |
| """ | ||
|
|
||
| trainee_role = ctx.guild.get_role(729537643951554583) # type: ignore | ||
| if members := trainee_role.members: | ||
| trainees = "\n".join( | ||
| f"{i}. {member.mention}" for i, member in enumerate(members, 1) | ||
| ) | ||
| else: | ||
| trainees = "No trainees yet." | ||
|
Comment on lines
-403
to
+405
There was a problem hiding this comment. Function
|
||
| embed = discord.Embed( | ||
| title="Trainees list", description=trainees, color=discord.Color.blue() | ||
| ) | ||
|
|
||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Function
Fun._beerpartyrefactored with the following changes:use-fstring-for-concatenation)simplify-len-comparison)