diff --git a/components/Avatar.vue b/components/Avatar.vue index 5f16251..ddfe1dc 100644 --- a/components/Avatar.vue +++ b/components/Avatar.vue @@ -13,29 +13,25 @@ import { NuxtImg } from '#components'; import type { GuildMemberResponse, UserResponse } from '~/types/interfaces'; const props = defineProps<{ - profile: UserResponse | GuildMemberResponse, + user?: UserResponse, + member?: GuildMemberResponse, }>(); -const displayName = getDisplayName(props.profile) + +let displayName: string let displayAvatar: string | null +const user = props.user || props.member?.user -if ("username" in props.profile) { - // assume it's a UserRespone - displayAvatar = props.profile.avatar - if (!displayAvatar) { - if (!isCanvasBlocked()) { - displayAvatar = generateDefaultIcon(displayName, props.profile.uuid) - } - } - -} else { - // assume it's a GuildMemberResponse - displayAvatar = props.profile.user.avatar - if (!displayAvatar) { - if (!isCanvasBlocked()) { - displayAvatar = generateDefaultIcon(displayName, props.profile.user_uuid) - } +if (user) { + displayName = getDisplayName(user, props.member) + + if (user.avatar) { + displayAvatar = user.avatar + } else if (!isCanvasBlocked()){ + displayAvatar = generateDefaultIcon(displayName, user.uuid) + } else { + displayAvatar = null } } diff --git a/components/Guild/MemberEntry.vue b/components/Guild/MemberEntry.vue index 1562ee5..12e36a0 100644 --- a/components/Guild/MemberEntry.vue +++ b/components/Guild/MemberEntry.vue @@ -1,33 +1,33 @@ diff --git a/components/Message.vue b/components/Message.vue index 71687e1..ed32c50 100644 --- a/components/Message.vue +++ b/components/Message.vue @@ -29,7 +29,7 @@ :text="props.replyMessage?.message" :reply-id="props.replyMessage.uuid" max-width="reply" />
- +
diff --git a/components/Modal/Base.vue b/components/Modal/Base.vue index b3d5ee3..1f57901 100644 --- a/components/Modal/Base.vue +++ b/components/Modal/Base.vue @@ -1,7 +1,7 @@