Fixed avatar_url and icon_url

Author: Defelo

general/news/cog.py

@@ -143,7 +143,7 @@ async def news_send(
 
         content = ""
         send_embed = Embed(title=t.news, description=message, colour=Colors.News)
-        send_embed.set_footer(text=t.sent_by(ctx.author, ctx.author.id), icon_url=ctx.author.avatar_url)
+        send_embed.set_footer(text=t.sent_by(ctx.author, ctx.author.id), icon_url=ctx.author.display_avatar.url)
 
         if authorization.notification_role_id is not None:
             role: Optional[Role] = ctx.guild.get_role(authorization.notification_role_id)

general/polls/cog.py

@@ -54,9 +54,9 @@ async def send_poll(
         raise CommandError(t.option_too_long(EmbedLimits.FIELD_VALUE))
 
     embed = Embed(title=title, description=question, color=Colors.Polls, timestamp=utcnow())
-    embed.set_author(name=str(ctx.author), icon_url=ctx.author.avatar_url)
+    embed.set_author(name=str(ctx.author), icon_url=ctx.author.display_avatar.url)
     if allow_delete:
-        embed.set_footer(text=t.created_by(ctx.author, ctx.author.id), icon_url=ctx.author.avatar_url)
+        embed.set_footer(text=t.created_by(ctx.author, ctx.author.id), icon_url=ctx.author.display_avatar.url)
 
     if len(set(map(lambda x: x.emoji, options))) < len(options):
         raise CommandError(t.option_duplicated)
@@ -217,7 +217,7 @@ async def team_yesno(self, ctx: Context, *, text: str):
         """
 
         embed = Embed(title=t.team_poll, description=text, color=Colors.Polls, timestamp=utcnow())
-        embed.set_author(name=str(ctx.author), icon_url=ctx.author.avatar_url)
+        embed.set_author(name=str(ctx.author), icon_url=ctx.author.display_avatar.url)
 
         embed.add_field(name=tg.status, value=await self.get_reacted_teamlers(), inline=False)
 

general/utils/cog.py

@@ -74,7 +74,7 @@ async def encode(self, ctx: Context, *, user: UserMemberConverter):
         user: Union[User, Member]
 
         embed = Embed(color=Colors.Utils)
-        embed.set_author(name=str(user), icon_url=user.avatar_url)
+        embed.set_author(name=str(user), icon_url=user.display_avatar.url)
         embed.add_field(name=t.username, value=str(user.name.encode())[2:-1], inline=False)
         if isinstance(user, Member) and user.nick:
             embed.add_field(name=t.nickname, value=str(user.nick.encode())[2:-1], inline=False)

information/server_info/cog.py

@@ -35,7 +35,8 @@ async def server(self, ctx: Context):
 
         guild: Guild = ctx.guild
         embed = Embed(title=guild.name, description=t.info_description, color=Colors.ServerInformation)
-        embed.set_thumbnail(url=guild.icon_url)
+        if guild.icon:
+            embed.set_thumbnail(url=guild.icon.url)
         created = guild.created_at.date()
         embed.add_field(name=t.creation_date, value=f"{created.day}.{created.month}.{created.year}")
         online_count = sum([m.status != Status.offline for m in guild.members])

information/user_info/cog.py

@@ -219,7 +219,7 @@ async def userinfo(self, ctx: Context, user: Optional[Union[User, int]] = None):
         if isinstance(user, int):
             embed.set_author(name=str(user))
         else:
-            embed.set_author(name=f"{user} ({user_id})", icon_url=user.avatar_url)
+            embed.set_author(name=f"{user} ({user_id})", icon_url=user.display_avatar.url)
 
         for response in await get_user_info_entries(user_id):
             for name, value in response:
@@ -294,7 +294,7 @@ async def userlogs(self, ctx: Context, user: Optional[Union[User, int]] = None):
         if isinstance(user, int):
             embed.set_author(name=str(user))
         else:
-            embed.set_author(name=f"{user} ({user_id})", icon_url=user.avatar_url)
+            embed.set_author(name=f"{user} ({user_id})", icon_url=user.display_avatar.url)
         for row in out:
             name = row[0].strftime("%d.%m.%Y %H:%M:%S")
             value = row[1]

integrations/adventofcode/cog.py

@@ -336,7 +336,7 @@ async def aoc_user(self, ctx: Context, *, user: Optional[Union[Member, str]]):
             progress = f"{completed}/{unlocked} ({full}{completed / unlocked * 100:.1f}%{full})"
 
         embed = Embed(title=f"Advent of Code {AOCConfig.YEAR}", colour=Colors.AdventOfCode)
-        icon_url = member.avatar_url if member else "https://adventofcode.com/favicon.png"
+        icon_url = member.display_avatar.url if member else "https://adventofcode.com/favicon.png"
         embed.set_author(name=name, icon_url=icon_url)
 
         linked = f"<@{member.id}>" + " (unverified)" * (not link) if member else "Not Linked"

integrations/discordpy_documentation/cog.py

@@ -216,7 +216,7 @@ async def do_rtfm(ctx: Context, key: str, obj: Optional[str]):
 
     e = discord.Embed(colour=Colors.DiscordPy, title=t.documentation(key.capitalize()))
     e.description = "\n".join(f"[`{key}`]({url})" for key, url in matches)
-    e.set_footer(text=tg.requested_by(ctx.author, ctx.author.id), icon_url=ctx.author.avatar_url)
+    e.set_footer(text=tg.requested_by(ctx.author, ctx.author.id), icon_url=ctx.author.display_avatar.url)
     await reply(ctx, embed=e)
 
 

integrations/run_code/cog.py

@@ -78,6 +78,6 @@ async def run(self, ctx, *, args: str):
         if api_result["stderr"] and not api_result["stdout"]:
             embed.colour = MaterialColors.error
 
-        embed.set_footer(text=tg.requested_by(ctx.author, ctx.author.id), icon_url=ctx.author.avatar_url)
+        embed.set_footer(text=tg.requested_by(ctx.author, ctx.author.id), icon_url=ctx.author.display_avatar.url)
 
         await send_long_embed(ctx, embed)

moderation/invites/cog.py

@@ -230,7 +230,8 @@ async def invites_show(self, ctx: Context, *, invite: AllowedServerConverter):
         invite_guild = await self.check_invite(invite.code)
         if invite_guild is not None:
             invite_title = t.invite_link
-            embed.set_thumbnail(url=invite_guild.guild.icon_url)
+            if invite_guild.guild.icon:
+                embed.set_thumbnail(url=invite_guild.guild.icon.url)
         else:
             invite_title = t.invite_link_expired
 

moderation/mod/cog.py

@@ -75,13 +75,13 @@ async def send_to_changelog_mod(
     else:
         member_id: int = member.id
         member_name: str = str(member)
-        embed.set_author(name=member_name, icon_url=member.avatar_url)
+        embed.set_author(name=member_name, icon_url=member.display_avatar.url)
 
     embed.add_field(name=t.log_field.member, value=f"<@{member_id}>", inline=True)
     embed.add_field(name=t.log_field.member_id, value=str(member_id), inline=True)
 
     if message:
-        embed.set_footer(text=str(message.author), icon_url=message.author.avatar_url)
+        embed.set_footer(text=str(message.author), icon_url=message.author.display_avatar.url)
         embed.add_field(
             name=t.log_field.channel,
             value=t.jump_url(message.channel.mention, message.jump_url),
@@ -307,7 +307,7 @@ async def report(self, ctx: Context, user: UserMemberConverter, *, reason: str):
 
         await Report.create(user.id, str(user), ctx.author.id, reason)
         server_embed = Embed(title=t.report, description=t.reported_response, colour=Colors.ModTools)
-        server_embed.set_author(name=str(user), icon_url=user.avatar_url)
+        server_embed.set_author(name=str(user), icon_url=user.display_avatar.url)
         await reply(ctx, embed=server_embed)
         await send_to_changelog_mod(ctx.guild, ctx.message, Colors.report, t.log_reported, user, reason)
 
@@ -333,7 +333,7 @@ async def warn(self, ctx: Context, user: UserMemberConverter, *, reason: str):
             colour=Colors.ModTools,
         )
         server_embed = Embed(title=t.warn, description=t.warned_response, colour=Colors.ModTools)
-        server_embed.set_author(name=str(user), icon_url=user.avatar_url)
+        server_embed.set_author(name=str(user), icon_url=user.display_avatar.url)
         try:
             await user.send(embed=user_embed)
         except (Forbidden, HTTPException):
@@ -383,7 +383,7 @@ async def mute(self, ctx: Context, user: UserMemberConverter, days: DurationConv
 
         user_embed = Embed(title=t.mute, colour=Colors.ModTools)
         server_embed = Embed(title=t.mute, description=t.muted_response, colour=Colors.ModTools)
-        server_embed.set_author(name=str(user), icon_url=user.avatar_url)
+        server_embed.set_author(name=str(user), icon_url=user.display_avatar.url)
 
         if days is not None:
             await Mute.create(user.id, str(user), ctx.author.id, days, reason, bool(active_mutes))
@@ -446,7 +446,7 @@ async def unmute(self, ctx: Context, user: UserMemberConverter, *, reason: str):
             raise UserCommandError(user, t.not_muted)
 
         server_embed = Embed(title=t.unmute, description=t.unmuted_response, colour=Colors.ModTools)
-        server_embed.set_author(name=str(user), icon_url=user.avatar_url)
+        server_embed.set_author(name=str(user), icon_url=user.display_avatar.url)
         await reply(ctx, embed=server_embed)
         await send_to_changelog_mod(ctx.guild, ctx.message, Colors.unmute, t.log_unmuted, user, reason)
 
@@ -479,10 +479,7 @@ async def kick(self, ctx: Context, member: Member, *, reason: str):
             colour=Colors.ModTools,
         )
         server_embed = Embed(title=t.kick, description=t.kicked_response, colour=Colors.ModTools)
-        server_embed.set_author(
-            name=str(member),
-            icon_url=member.avatar_url_as(format=("gif" if member.is_avatar_animated() else "png")),
-        )
+        server_embed.set_author(name=str(member), icon_url=member.display_avatar.url)
 
         try:
             await member.send(embed=user_embed)
@@ -544,7 +541,7 @@ async def ban(
 
         user_embed = Embed(title=t.ban, colour=Colors.ModTools)
         server_embed = Embed(title=t.ban, description=t.banned_response, colour=Colors.ModTools)
-        server_embed.set_author(name=str(user), icon_url=user.avatar_url)
+        server_embed.set_author(name=str(user), icon_url=user.display_avatar.url)
 
         if ban_days is not None:
             await Ban.create(user.id, str(user), ctx.author.id, ban_days, reason, bool(active_bans))
@@ -611,6 +608,6 @@ async def unban(self, ctx: Context, user: UserMemberConverter, *, reason: str):
             raise UserCommandError(user, t.not_banned)
 
         server_embed = Embed(title=t.unban, description=t.unbanned_response, colour=Colors.ModTools)
-        server_embed.set_author(name=str(user), icon_url=user.avatar_url)
+        server_embed.set_author(name=str(user), icon_url=user.display_avatar.url)
         await reply(ctx, embed=server_embed)
         await send_to_changelog_mod(ctx.guild, ctx.message, Colors.unban, t.log_unbanned, user, reason)