From 1225034f72a948636ed11ea3612fa886d82e743e Mon Sep 17 00:00:00 2001 From: Zevaryx Date: Wed, 23 Mar 2022 19:04:31 -0600 Subject: [PATCH] More logging --- jarvis/client.py | 7 +++++-- jarvis/cogs/admin/warning.py | 3 +++ jarvis/cogs/dev.py | 3 ++- jarvis/cogs/remindme.py | 23 +++++++++++++++++++++++ jarvis/cogs/verify.py | 2 ++ 5 files changed, 35 insertions(+), 3 deletions(-) diff --git a/jarvis/client.py b/jarvis/client.py index 74e6020..9f99005 100644 --- a/jarvis/client.py +++ b/jarvis/client.py @@ -407,7 +407,7 @@ class Jarvis(Snake): url=after.jump_url, ) embed.set_footer( - text=f"{after.author.user.username}#{after.author.discriminator} | {after.author.id}" + text=f"{after.author.username}#{after.author.discriminator} | {after.author.id}" ) await channel.send(embed=embed) if not isinstance(after.channel, DMChannel) and not after.author.bot: @@ -475,6 +475,9 @@ class Jarvis(Snake): url=message.jump_url, ) embed.set_footer( - text=f"{message.author.user.username}#{message.author.discriminator} | {message.author.id}" + text=( + f"{message.author.username}#{message.author.discriminator} | " + f"{message.author.id}" + ) ) await channel.send(embed=embed) diff --git a/jarvis/cogs/admin/warning.py b/jarvis/cogs/admin/warning.py index 3ef1a8a..0c15964 100644 --- a/jarvis/cogs/admin/warning.py +++ b/jarvis/cogs/admin/warning.py @@ -87,6 +87,9 @@ class WarningCog(ModcaseCog): .sort("created_at", -1) .to_list(None) ) + if len(warnings) == 0: + await ctx.send("That user has no warnings.", ephemeral=True) + return active_warns = get_all(warnings, active=True) pages = [] diff --git a/jarvis/cogs/dev.py b/jarvis/cogs/dev.py index 5d419e3..946e374 100644 --- a/jarvis/cogs/dev.py +++ b/jarvis/cogs/dev.py @@ -88,8 +88,9 @@ class DevCog(Scale): title = attach.filename elif url.match(data): try: - if await get_size(data) > MAX_FILESIZE: + if (size := await get_size(data)) > MAX_FILESIZE: await ctx.send("Please hash files that are <= 5GB in size", ephemeral=True) + self.logger.debug(f"Refused to hash file of size {convert_bytesize(size)}") return except Exception as e: await ctx.send(f"Failed to retrieve URL: ```\n{e}\n```", ephemeral=True) diff --git a/jarvis/cogs/remindme.py b/jarvis/cogs/remindme.py index 728af87..c5bcd21 100644 --- a/jarvis/cogs/remindme.py +++ b/jarvis/cogs/remindme.py @@ -277,6 +277,29 @@ class RemindmeCog(Scale): component.disabled = True await message.edit(components=components) + @slash_command( + name="reminders", + sub_cmd_name="fetch", + sub_cmd_description="Fetch a reminder that failed to send", + ) + @slash_option( + name="id", description="ID of the reminder", opt_type=OptionTypes.STRING, required=True + ) + async def _fetch(self, ctx: InteractionContext, id: str) -> None: + reminder = await Reminder.find_one(q(id=id)) + if not reminder: + await ctx.send(f"Reminder {id} does not exist") + return + + embed = build_embed(title="You have a reminder!", description=reminder.message, fields=[]) + embed.set_author( + name=ctx.author.display_name + "#" + ctx.author.discriminator, + icon_url=ctx.author.display_avatar, + ) + + embed.set_thumbnail(url=ctx.author.display_avatar) + await ctx.send(embed=embed, ephemeral=reminder.private) + def setup(bot: Snake) -> None: """Add RemindmeCog to J.A.R.V.I.S.""" diff --git a/jarvis/cogs/verify.py b/jarvis/cogs/verify.py index f281d97..05a723d 100644 --- a/jarvis/cogs/verify.py +++ b/jarvis/cogs/verify.py @@ -81,6 +81,7 @@ class VerifyCog(Scale): components=components, ) await response.context.message.delete(delay=5) + self.logger.debug(f"User {ctx.author.id} verified successfully") else: await response.context.edit_origin( content=( @@ -90,6 +91,7 @@ class VerifyCog(Scale): ) except asyncio.TimeoutError: await message.delete(delay=30) + self.logger.debug(f"User {ctx.author.id} failed to verify before timeout") def setup(bot: Snake) -> None: