From 638ae08bdde69bd7dc72703881621c6c04179462 Mon Sep 17 00:00:00 2001 From: Zevaryx Date: Sun, 29 May 2022 19:24:34 -0600 Subject: [PATCH] Fix issue with display_avatar being called before checking instance type --- jarvis/utils/cogs.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/jarvis/utils/cogs.py b/jarvis/utils/cogs.py index f176a10..ff757e5 100644 --- a/jarvis/utils/cogs.py +++ b/jarvis/utils/cogs.py @@ -7,6 +7,7 @@ from jarvis_core.db.models import Action, Ban, Kick, Modlog, Mute, Setting, Warn from naff import Client, Extension, InteractionContext from naff.models.discord.components import ActionRow, Button, ButtonStyles from naff.models.discord.embed import EmbedField +from naff.models.discord.user import Member from jarvis.utils import build_embed @@ -113,9 +114,10 @@ class ModcaseCog(Extension): description=f"Would you like to open a moderation case for {user.mention}?", fields=[], ) - embed.set_author( - name=user.username + "#" + user.discriminator, icon_url=user.display_avatar.url - ) + avatar_url = user.avatar.url + if isinstance(user, Member): + avatar_url = user.display_avatar.url + embed.set_author(name=user.username + "#" + user.discriminator, icon_url=avatar_url) components = [ ActionRow( Button(style=ButtonStyles.RED, emoji="✖️", custom_id="modcase|no"),