From 82b906cdb15fd3bb4943dd4da115b45d04f02807 Mon Sep 17 00:00:00 2001 From: Zevaryx Date: Fri, 4 Feb 2022 10:18:43 -0700 Subject: [PATCH] Fix avatars and component callback checks --- jarvis/cogs/admin/kick.py | 11 ++++------- jarvis/cogs/admin/mute.py | 21 ++++++--------------- jarvis/cogs/admin/roleping.py | 2 +- jarvis/cogs/admin/warning.py | 12 ++++-------- jarvis/cogs/modlog/command.py | 5 +---- jarvis/cogs/modlog/member.py | 5 +---- jarvis/cogs/modlog/message.py | 4 ++-- jarvis/cogs/modlog/utils.py | 5 +---- jarvis/cogs/remindme.py | 14 +++++++------- jarvis/cogs/starboard.py | 2 +- jarvis/events/message.py | 6 +++--- jarvis/tasks/reminder.py | 5 ++--- 12 files changed, 33 insertions(+), 59 deletions(-) diff --git a/jarvis/cogs/admin/kick.py b/jarvis/cogs/admin/kick.py index b772aff..623ddbb 100644 --- a/jarvis/cogs/admin/kick.py +++ b/jarvis/cogs/admin/kick.py @@ -42,7 +42,7 @@ class KickCog(Scale): embed.set_author( name=ctx.author.username + "#" + ctx.author.discriminator, - icon_url=ctx.author.display_avatar, + icon_url=ctx.author.display_avatar.url, ) embed.set_thumbnail(url=ctx.guild.icon.url) @@ -60,12 +60,9 @@ class KickCog(Scale): fields=fields, ) - embed.set_author( - name=user.nick if user.nick else user.name, - icon_url=user.display_avatar, - ) - embed.set_thumbnail(url=user.display_avatar) - embed.set_footer(text=f"{user.name}#{user.discriminator} | {user.id}") + embed.set_author(name=user.display_name, icon_url=user.display_avatar.url) + embed.set_thumbnail(url=user.display_avatar.url) + embed.set_footer(text=f"{user.username}#{user.discriminator} | {user.id}") await ctx.send(embed=embed) _ = Kick( diff --git a/jarvis/cogs/admin/mute.py b/jarvis/cogs/admin/mute.py index 8c36fbb..f34507d 100644 --- a/jarvis/cogs/admin/mute.py +++ b/jarvis/cogs/admin/mute.py @@ -88,11 +88,8 @@ class MuteCog(Scale): description=f"{user.mention} has been muted", fields=[EmbedField(name="Reason", value=reason)], ) - embed.set_author( - name=user.display_name, - icon_url=user.display_avatar, - ) - embed.set_thumbnail(url=user.display_avatar) + embed.set_author(name=user.display_name, icon_url=user.display_avatar.url) + embed.set_thumbnail(url=user.display_avatar.url) embed.set_footer(text=f"{user.username}#{user.discriminator} | {user.id}") await ctx.send(embed=embed) @@ -118,17 +115,11 @@ class MuteCog(Scale): description=f"{user.mention} has been unmuted", fields=[], ) - embed.set_author( - name=user.display_name, - icon_url=user.display_avatar, - ) - embed.set_thumbnail(url=user.display_avatar) + embed.set_author(name=user.display_name, icon_url=user.display_avatar.url) + embed.set_thumbnail(url=user.display_avatar.url) embed.set_footer(text=f"{user.username}#{user.discriminator} | {user.id}") await ctx.send(embed=embed) - embed.set_author( - name=user.display_name, - icon_url=user.display_avatar, - ) - embed.set_thumbnail(url=user.display_avatar) + embed.set_author(name=user.display_name, icon_url=user.display_avatar.url) + embed.set_thumbnail(url=user.display_avatar.url) embed.set_footer(text=f"{user.username}#{user.discriminator} | {user.id}") await ctx.send(embed=embed) diff --git a/jarvis/cogs/admin/roleping.py b/jarvis/cogs/admin/roleping.py index 1dc1561..6a01ede 100644 --- a/jarvis/cogs/admin/roleping.py +++ b/jarvis/cogs/admin/roleping.py @@ -111,7 +111,7 @@ class RolepingCog(CacheCog): if not admin: admin = self.bot.user - embed.set_author(name=admin.display_name, icon_url=admin.display_avatar) + embed.set_author(name=admin.display_name, icon_url=admin.display_avatar.url) embed.set_footer(text=f"{admin.name}#{admin.discriminator} | {admin.id}") embeds.append(embed) diff --git a/jarvis/cogs/admin/warning.py b/jarvis/cogs/admin/warning.py index c07c15c..edd0db5 100644 --- a/jarvis/cogs/admin/warning.py +++ b/jarvis/cogs/admin/warning.py @@ -67,10 +67,7 @@ class WarningCog(CacheCog): description=f"{user.mention} has been warned", fields=fields, ) - embed.set_author( - name=user.display_name, - icon_url=user.display_avatar, - ) + embed.set_author(name=user.display_name, icon_url=user.display_avatar.url) embed.set_footer(text=f"{user.name}#{user.discriminator} | {user.id}") await ctx.send(embed=embed) @@ -114,7 +111,7 @@ class WarningCog(CacheCog): description=f"{warnings.count()} total | 0 currently active", fields=[], ) - embed.set_author(name=user.username, icon_url=user.display_avatar) + embed.set_author(name=user.username, icon_url=user.display_avatar.url) embed.set_thumbnail(url=ctx.guild.icon.url) pages.append(embed) else: @@ -141,7 +138,7 @@ class WarningCog(CacheCog): ) embed.set_author( name=user.username + "#" + user.discriminator, - icon_url=user.display_avatar, + icon_url=user.display_avatar.url, ) embed.set_thumbnail(url=ctx.guild.icon.url) embed.set_footer(text=f"{user.username}#{user.discriminator} | {user.id}") @@ -167,8 +164,7 @@ class WarningCog(CacheCog): fields=fields[i : i + 5], ) embed.set_author( - name=user.username + "#" + user.discriminator, - icon_url=user.display_avatar, + name=user.username + "#" + user.discriminator, icon_url=user.display_avatar.url ) embed.set_thumbnail(url=ctx.guild.icon.url) pages.append(embed) diff --git a/jarvis/cogs/modlog/command.py b/jarvis/cogs/modlog/command.py index 884fac5..75d54b5 100644 --- a/jarvis/cogs/modlog/command.py +++ b/jarvis/cogs/modlog/command.py @@ -41,10 +41,7 @@ class ModlogCommandCog(commands.Cog): fields=fields, color="#fc9e3f", ) - embed.set_author( - name=ctx.author.username, - icon_url=ctx.author.display_avatar, - ) + embed.set_author(name=ctx.author.username, icon_url=ctx.author.display_avatar.url) embed.set_footer( text=f"{ctx.author.username}#{ctx.author.discriminator} | {ctx.author.id}" ) diff --git a/jarvis/cogs/modlog/member.py b/jarvis/cogs/modlog/member.py index 9453e19..99302d7 100644 --- a/jarvis/cogs/modlog/member.py +++ b/jarvis/cogs/modlog/member.py @@ -322,10 +322,7 @@ class ModlogMemberCog(commands.Cog): fields=fields, timestamp=log.created_at, ) - embed.set_author( - name=f"{after.name}", - icon_url=after.display_avatar, - ) + embed.set_author(name=f"{after.name}", icon_url=after.display_avatar.url) embed.set_footer(text=f"{after.name}#{after.discriminator} | {after.id}") elif len(before.roles) != len(after.roles): # TODO: User got a new role diff --git a/jarvis/cogs/modlog/message.py b/jarvis/cogs/modlog/message.py index 853680b..a00bb69 100644 --- a/jarvis/cogs/modlog/message.py +++ b/jarvis/cogs/modlog/message.py @@ -44,7 +44,7 @@ class ModlogMessageCog(commands.Cog): ) embed.set_author( name=before.author.name, - icon_url=before.author.display_avatar, + icon_url=before.author.display_avatar.url, url=after.jump_url, ) embed.set_footer( @@ -99,7 +99,7 @@ class ModlogMessageCog(commands.Cog): embed.set_author( name=message.author.name, - icon_url=message.author.display_avatar, + icon_url=message.author.display_avatar.url, url=message.jump_url, ) embed.set_footer( diff --git a/jarvis/cogs/modlog/utils.py b/jarvis/cogs/modlog/utils.py index 4344ff8..28a63fb 100644 --- a/jarvis/cogs/modlog/utils.py +++ b/jarvis/cogs/modlog/utils.py @@ -33,10 +33,7 @@ def modlog_embed( fields=fields, timestamp=log.created_at, ) - embed.set_author( - name=f"{member.name}", - icon_url=member.display_avatar, - ) + embed.set_author(name=f"{member.name}", icon_url=member.display_avatar.url) embed.set_footer(text=f"{member.name}#{member.discriminator} | {member.id}") return embed diff --git a/jarvis/cogs/remindme.py b/jarvis/cogs/remindme.py index e1973ca..73a3214 100644 --- a/jarvis/cogs/remindme.py +++ b/jarvis/cogs/remindme.py @@ -146,9 +146,9 @@ class RemindmeCog(CacheCog): embed.set_author( name=ctx.author.username + "#" + ctx.author.discriminator, - icon_url=ctx.author.display_avatar, + icon_url=ctx.author.display_avatar.url, ) - embed.set_thumbnail(url=ctx.author.display_avatar) + embed.set_thumbnail(url=ctx.author.display_avatar.url) await ctx.send(embed=embed) @@ -174,9 +174,9 @@ class RemindmeCog(CacheCog): embed.set_author( name=ctx.author.username + "#" + ctx.author.discriminator, - icon_url=ctx.author.display_avatar, + icon_url=ctx.author.display_avatar.url, ) - embed.set_thumbnail(url=ctx.author.display_avatar) + embed.set_thumbnail(url=ctx.author.display_avatar.url) return embed @@ -233,7 +233,7 @@ class RemindmeCog(CacheCog): try: context = await self.bot.wait_for_component( - check=lambda x: ctx.author.id == x.author_id, + check=lambda x: ctx.author.id == x.context.author.id, messages=message, timeout=60 * 5, ) @@ -261,9 +261,9 @@ class RemindmeCog(CacheCog): embed.set_author( name=ctx.author.username + "#" + ctx.author.discriminator, - icon_url=ctx.author.display_avatar, + icon_url=ctx.author.display_avatar.url, ) - embed.set_thumbnail(url=ctx.author.display_avatar) + embed.set_thumbnail(url=ctx.author.display_avatar.url) await context.context.edit_origin( content=f"Deleted {len(context.context.values)} reminder(s)", diff --git a/jarvis/cogs/starboard.py b/jarvis/cogs/starboard.py index 2f39d5f..af9d425 100644 --- a/jarvis/cogs/starboard.py +++ b/jarvis/cogs/starboard.py @@ -201,7 +201,7 @@ class StarboardCog(Scale): embed.set_author( name=message.author.display_name, url=message.jump_url, - icon_url=message.author.display_avatar, + icon_url=message.author.display_avatar.url, ) embed.set_footer(text=message.guild.name + " | " + message.channel.name) if image_url: diff --git a/jarvis/events/message.py b/jarvis/events/message.py index ceb73ef..f62dc4a 100644 --- a/jarvis/events/message.py +++ b/jarvis/events/message.py @@ -85,7 +85,7 @@ class MessageEventHandler(object): ) embed.set_author( name=message.author.nick if message.author.nick else message.author.name, - icon_url=message.author.display_avatar, + icon_url=message.author.display_avatar.url, ) embed.set_footer( text=f"{message.author.name}#{message.author.discriminator} | {message.author.id}" # noqa: E501 @@ -121,7 +121,7 @@ class MessageEventHandler(object): ) embed.set_author( name=message.author.nick if message.author.nick else message.author.name, - icon_url=message.author.display_avatar, + icon_url=message.author.display_avatar.url, ) embed.set_footer( text=f"{message.author.name}#{message.author.discriminator} | {message.author.id}" @@ -191,7 +191,7 @@ class MessageEventHandler(object): ) embed.set_author( name=message.author.nick if message.author.nick else message.author.name, - icon_url=message.author.display_avatar, + icon_url=message.author.display_avatar.url, ) embed.set_footer( text=f"{message.author.name}#{message.author.discriminator} | {message.author.id}" diff --git a/jarvis/tasks/reminder.py b/jarvis/tasks/reminder.py index a4b1601..4c65e8e 100644 --- a/jarvis/tasks/reminder.py +++ b/jarvis/tasks/reminder.py @@ -25,10 +25,9 @@ async def _remind() -> None: fields=[], ) embed.set_author( - name=user.name + "#" + user.discriminator, - icon_url=user.display_avatar, + name=user.name + "#" + user.discriminator, icon_url=user.display_avatar.url ) - embed.set_thumbnail(url=user.display_avatar) + embed.set_thumbnail(url=user.display_avatar.url) try: await user.send(embed=embed) except Exception: