X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fshared%2Fshared-main%2Faccount%2Factor.model.ts;h=6e45ba588355b539f3b36a7e4500fae97e965e9f;hb=2b621ac0ebe83693bba6354b3482a03ba58143e7;hp=bd693860d77ec6f2fe2fd4f4b46bfea2ae1aab41;hpb=7b51ede977c299a74728171d8c124bcc4cbba6ea;p=github%2FChocobozzz%2FPeerTube.git 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 bd693860d..6e45ba588 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 avatarsAscWidth = actor.avatars.sort((a, b) => a.width - b.width) + + const avatar = size + ? avatarsAscWidth.find(a => a.width >= size) + : avatarsAscWidth[avatarsAscWidth.length - 1] // Bigger one if (!avatar) return '' if (avatar.url) return avatar.url @@ -55,7 +59,7 @@ export abstract class Actor implements ServerActor { if (hash.createdAt) this.createdAt = new Date(hash.createdAt.toString()) - this.avatars = hash.avatars + this.avatars = hash.avatars || [] this.isLocal = Actor.IS_LOCAL(this.host) } }