diff --git a/jarvis/cogs/admin/kick.py b/jarvis/cogs/admin/kick.py index b551225..b7b0a6d 100644 --- a/jarvis/cogs/admin/kick.py +++ b/jarvis/cogs/admin/kick.py @@ -43,7 +43,7 @@ class KickCog(Scale): embed.set_author( name=ctx.author.username + "#" + ctx.author.discriminator, - icon_url=ctx.author.avatar_url, + icon_url=ctx.author.display_avatar, ) embed.set_thumbnail(url=ctx.guild.icon_url) @@ -63,9 +63,9 @@ class KickCog(Scale): embed.set_author( name=user.nick if user.nick else user.name, - icon_url=user.avatar_url, + icon_url=user.display_avatar, ) - embed.set_thumbnail(url=user.avatar_url) + embed.set_thumbnail(url=user.display_avatar) embed.set_footer(text=f"{user.name}#{user.discriminator} | {user.id}") await ctx.send(embed=embed) diff --git a/jarvis/cogs/admin/mute.py b/jarvis/cogs/admin/mute.py index 7f5adf6..b406fd4 100644 --- a/jarvis/cogs/admin/mute.py +++ b/jarvis/cogs/admin/mute.py @@ -89,9 +89,9 @@ class MuteCog(Scale): ) embed.set_author( name=user.display_name, - icon_url=user.avatar_url, + icon_url=user.display_avatar, ) - embed.set_thumbnail(url=user.avatar_url) + embed.set_thumbnail(url=user.display_avatar) embed.set_footer(text=f"{user.username}#{user.discriminator} | {user.id}") await ctx.send(embed=embed) @@ -117,15 +117,15 @@ class MuteCog(Scale): ) embed.set_author( name=user.display_name, - icon_url=user.avatar_url, + icon_url=user.display_avatar, ) - embed.set_thumbnail(url=user.avatar_url) + embed.set_thumbnail(url=user.display_avatar) 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.avatar_url, + icon_url=user.display_avatar, ) - embed.set_thumbnail(url=user.avatar_url) + embed.set_thumbnail(url=user.display_avatar) 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 2095318..982251e 100644 --- a/jarvis/cogs/admin/roleping.py +++ b/jarvis/cogs/admin/roleping.py @@ -112,7 +112,7 @@ class RolepingCog(CacheCog): if not admin: admin = self.bot.user - embed.set_author(name=admin.display_name, icon_url=admin.avatar_url) + embed.set_author(name=admin.display_name, icon_url=admin.display_avatar) 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 c807efd..9196011 100644 --- a/jarvis/cogs/admin/warning.py +++ b/jarvis/cogs/admin/warning.py @@ -70,7 +70,7 @@ class WarningCog(CacheCog): ) embed.set_author( name=user.display_name, - icon_url=user.avatar_url, + icon_url=user.display_avatar, ) embed.set_footer(text=f"{user.name}#{user.discriminator} | {user.id}") @@ -117,7 +117,7 @@ class WarningCog(CacheCog): description=f"{warnings.count()} total | 0 currently active", fields=[], ) - embed.set_author(name=user.username, icon_url=user.avatar_url) + embed.set_author(name=user.username, icon_url=user.display_avatar) embed.set_thumbnail(url=ctx.guild.icon_url) pages.append(embed) else: @@ -144,7 +144,7 @@ class WarningCog(CacheCog): ) embed.set_author( name=user.username + "#" + user.discriminator, - icon_url=user.avatar_url, + icon_url=user.display_avatar, ) embed.set_thumbnail(url=ctx.guild.icon_url) embed.set_footer(text=f"{user.username}#{user.discriminator} | {user.id}") @@ -171,7 +171,7 @@ class WarningCog(CacheCog): ) embed.set_author( name=user.username + "#" + user.discriminator, - icon_url=user.avatar_url, + icon_url=user.display_avatar, ) embed.set_thumbnail(url=ctx.guild.icon_url) pages.append(embed) diff --git a/jarvis/cogs/gitlab.py b/jarvis/cogs/gitlab.py index 28f8a04..33b278c 100644 --- a/jarvis/cogs/gitlab.py +++ b/jarvis/cogs/gitlab.py @@ -86,7 +86,7 @@ class GitlabCog(CacheCog): ) embed.set_author( name=issue.author["name"], - icon_url=issue.author["avatar_url"], + icon_url=issue.author["display_avatar"], url=issue.author["web_url"], ) embed.set_thumbnail( @@ -220,7 +220,7 @@ class GitlabCog(CacheCog): ) embed.set_author( name=mr.author["name"], - icon_url=mr.author["avatar_url"], + icon_url=mr.author["display_avatar"], url=mr.author["web_url"], ) embed.set_thumbnail( diff --git a/jarvis/cogs/modlog/command.py b/jarvis/cogs/modlog/command.py index b03666d..084e773 100644 --- a/jarvis/cogs/modlog/command.py +++ b/jarvis/cogs/modlog/command.py @@ -43,7 +43,7 @@ class ModlogCommandCog(commands.Cog): ) embed.set_author( name=ctx.author.name, - icon_url=ctx.author.avatar_url, + icon_url=ctx.author.display_avatar, ) embed.set_footer( text=f"{ctx.author.name}#{ctx.author.discriminator} | {ctx.author.id}" diff --git a/jarvis/cogs/modlog/member.py b/jarvis/cogs/modlog/member.py index d6423cc..9453e19 100644 --- a/jarvis/cogs/modlog/member.py +++ b/jarvis/cogs/modlog/member.py @@ -324,7 +324,7 @@ class ModlogMemberCog(commands.Cog): ) embed.set_author( name=f"{after.name}", - icon_url=after.avatar_url, + icon_url=after.display_avatar, ) embed.set_footer(text=f"{after.name}#{after.discriminator} | {after.id}") elif len(before.roles) != len(after.roles): diff --git a/jarvis/cogs/modlog/message.py b/jarvis/cogs/modlog/message.py index 1834877..853680b 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.avatar_url, + icon_url=before.author.display_avatar, 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.avatar_url, + icon_url=message.author.display_avatar, url=message.jump_url, ) embed.set_footer( diff --git a/jarvis/cogs/modlog/utils.py b/jarvis/cogs/modlog/utils.py index 8831016..4344ff8 100644 --- a/jarvis/cogs/modlog/utils.py +++ b/jarvis/cogs/modlog/utils.py @@ -35,7 +35,7 @@ def modlog_embed( ) embed.set_author( name=f"{member.name}", - icon_url=member.avatar_url, + icon_url=member.display_avatar, ) 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 3d75bdc..7f7c5da 100644 --- a/jarvis/cogs/remindme.py +++ b/jarvis/cogs/remindme.py @@ -149,9 +149,9 @@ class RemindmeCog(CacheCog): embed.set_author( name=ctx.author.username + "#" + ctx.author.discriminator, - icon_url=ctx.author.avatar_url, + icon_url=ctx.author.display_avatar, ) - embed.set_thumbnail(url=ctx.author.avatar_url) + embed.set_thumbnail(url=ctx.author.display_avatar) await ctx.send(embed=embed) @@ -177,9 +177,9 @@ class RemindmeCog(CacheCog): embed.set_author( name=ctx.author.username + "#" + ctx.author.discriminator, - icon_url=ctx.author.avatar_url, + icon_url=ctx.author.display_avatar, ) - embed.set_thumbnail(url=ctx.author.avatar_url) + embed.set_thumbnail(url=ctx.author.display_avatar) return embed @@ -265,9 +265,9 @@ class RemindmeCog(CacheCog): embed.set_author( name=ctx.author.name + "#" + ctx.author.discriminator, - icon_url=ctx.author.avatar_url, + icon_url=ctx.author.display_avatar, ) - embed.set_thumbnail(url=ctx.author.avatar_url) + embed.set_thumbnail(url=ctx.author.display_avatar) await used_component.context.edit_origin( content=f"Deleted {len(used_component.context.values)} reminder(s)", @@ -296,9 +296,9 @@ class RemindmeCog(CacheCog): ) embed.set_author( name=user.name + "#" + user.discriminator, - icon_url=user.avatar_url, + icon_url=user.display_avatar, ) - embed.set_thumbnail(url=user.avatar_url) + embed.set_thumbnail(url=user.display_avatar) try: await user.send(embed=embed) except Exception: diff --git a/jarvis/cogs/starboard.py b/jarvis/cogs/starboard.py index d2eb830..4807be7 100644 --- a/jarvis/cogs/starboard.py +++ b/jarvis/cogs/starboard.py @@ -221,7 +221,7 @@ class StarboardCog(commands.Cog): embed.set_author( name=message.author.name, url=message.jump_url, - icon_url=message.author.avatar_url, + icon_url=message.author.display_avatar, ) embed.set_footer(text=message.guild.name + " | " + message.channel.name) if image_url: diff --git a/jarvis/cogs/util.py b/jarvis/cogs/util.py index dfd6cdc..1696db7 100644 --- a/jarvis/cogs/util.py +++ b/jarvis/cogs/util.py @@ -126,7 +126,7 @@ class UtilCog(commands.Cog): if not user: user = ctx.author - avatar = user.avatar_url + avatar = user.display_avatar embed = build_embed(title="Avatar", description="", fields=[], color="#00FFEE") embed.set_image(url=avatar) embed.set_author(name=f"{user.name}#{user.discriminator}", icon_url=avatar) @@ -223,8 +223,8 @@ class UtilCog(commands.Cog): color=str(user_roles[0].color) if user_roles else "#FF0000", ) - embed.set_author(name=f"{user.name}#{user.discriminator}", icon_url=user.avatar_url) - embed.set_thumbnail(url=user.avatar_url) + embed.set_author(name=f"{user.name}#{user.discriminator}", icon_url=user.display_avatar) + embed.set_thumbnail(url=user.display_avatar) embed.set_footer(text=f"ID: {user.id}") await ctx.send(embed=embed) diff --git a/jarvis/events/message.py b/jarvis/events/message.py index a449019..74b68e6 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.avatar_url, + icon_url=message.author.display_avatar, ) 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.avatar_url, + icon_url=message.author.display_avatar, ) 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.avatar_url, + icon_url=message.author.display_avatar, ) embed.set_footer( text=f"{message.author.name}#{message.author.discriminator} | {message.author.id}"