X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fshared%2Fshared-main%2Faccount%2Faccount.model.ts;h=e34f6ef642ff7e2cd720abd9179409d2f903a613;hb=04c2dcfc6b78c7e8714597f9d5370b6b2c87dece;hp=7b5611f35a21e47654b880bcfd6a2bef1934209a;hpb=dc2b2938c293bae271a27a6c823f66496998b4d3;p=github%2FChocobozzz%2FPeerTube.git 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 7b5611f35..e34f6ef64 100644 --- a/client/src/app/shared/shared-main/account/account.model.ts +++ b/client/src/app/shared/shared-main/account/account.model.ts @@ -1,4 +1,4 @@ -import { Account as ServerAccount, Actor as ServerActor, ActorImage } from '@shared/models' +import { Account as ServerAccount, ActorImage, BlockStatus } from '@shared/models' import { Actor } from './actor.model' export class Account extends Actor implements ServerAccount { @@ -17,11 +17,15 @@ export class Account extends Actor implements ServerAccount { userId?: number - static GET_ACTOR_AVATAR_URL (actor: { avatar?: { url?: string, path: string } }) { - return Actor.GET_ACTOR_AVATAR_URL(actor) + 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 () { + static GET_DEFAULT_AVATAR_URL (size?: number) { + if (size && size <= 48) { + return `${window.location.origin}/client/assets/images/default-avatar-account-48x48.png` + } + return `${window.location.origin}/client/assets/images/default-avatar-account.png` } @@ -42,11 +46,18 @@ export class Account extends Actor implements ServerAccount { this.mutedServerByInstance = false } - updateAvatar (newAvatar: ActorImage) { - this.avatar = newAvatar + updateAvatar (newAvatars: ActorImage[]) { + this.avatars = newAvatars } resetAvatar () { - this.avatar = null + this.avatars = [] + } + + updateBlockStatus (blockStatus: BlockStatus) { + this.mutedByInstance = blockStatus.accounts[this.nameWithHostForced].blockedByServer + this.mutedByUser = blockStatus.accounts[this.nameWithHostForced].blockedByUser + this.mutedServerByUser = blockStatus.hosts[this.host].blockedByUser + this.mutedServerByInstance = blockStatus.hosts[this.host].blockedByServer } }