From 4428ad543e0c717eb7edb27003b9d9a52c616d5d Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 2 May 2022 13:46:09 +0200 Subject: Fix avatar responsive --- client/src/app/shared/shared-main/account/account.model.ts | 6 +++--- client/src/app/shared/shared-main/account/actor.model.ts | 8 ++++++-- 2 files changed, 9 insertions(+), 5 deletions(-) (limited to 'client/src/app/shared/shared-main') diff --git a/client/src/app/shared/shared-main/account/account.model.ts b/client/src/app/shared/shared-main/account/account.model.ts index a26a9c11c..e34f6ef64 100644 --- a/client/src/app/shared/shared-main/account/account.model.ts +++ b/client/src/app/shared/shared-main/account/account.model.ts @@ -17,12 +17,12 @@ export class Account extends Actor implements ServerAccount { userId?: number - static GET_ACTOR_AVATAR_URL (actor: { avatars: { width: number, url?: string, path: string }[] }, size: number) { + static GET_ACTOR_AVATAR_URL (actor: { avatars: { width: number, url?: string, path: string }[] }, size?: number) { return Actor.GET_ACTOR_AVATAR_URL(actor, size) } - static GET_DEFAULT_AVATAR_URL (size: number) { - if (size <= 48) { + static GET_DEFAULT_AVATAR_URL (size?: number) { + if (size && size <= 48) { return `${window.location.origin}/client/assets/images/default-avatar-account-48x48.png` } diff --git a/client/src/app/shared/shared-main/account/actor.model.ts b/client/src/app/shared/shared-main/account/actor.model.ts index 977fdb7e5..8427c9902 100644 --- a/client/src/app/shared/shared-main/account/actor.model.ts +++ b/client/src/app/shared/shared-main/account/actor.model.ts @@ -20,8 +20,12 @@ export abstract class Actor implements ServerActor { isLocal: boolean - static GET_ACTOR_AVATAR_URL (actor: { avatars: { width: number, url?: string, path: string }[] }, size: number) { - const avatar = actor.avatars.sort((a, b) => a.width - b.width).find(a => a.width >= size) + static GET_ACTOR_AVATAR_URL (actor: { avatars: { width: number, url?: string, path: string }[] }, size?: number) { + const avatars = actor.avatars.sort((a, b) => a.width - b.width) + + const avatar = size + ? avatars.find(a => a.width >= size) + : avatars[0] if (!avatar) return '' if (avatar.url) return avatar.url -- cgit v1.2.3