X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=client%2Fsrc%2Fapp%2Fshared%2Fshared-main%2Faccount%2Faccount.model.ts;h=7b5611f35a21e47654b880bcfd6a2bef1934209a;hb=dc2b2938c293bae271a27a6c823f66496998b4d3;hp=65e6798d44decf2badb892bb3d7e3aa6f14fef35;hpb=4024c44f9027a32809931de0692d40d001df721c;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 65e6798d4..7b5611f35 100644 --- a/client/src/app/shared/shared-main/account/account.model.ts +++ b/client/src/app/shared/shared-main/account/account.model.ts @@ -4,8 +4,12 @@ import { Actor } from './actor.model' export class Account extends Actor implements ServerAccount { displayName: string description: string + + updatedAt: Date | string + nameWithHost: string nameWithHostForced: string + mutedByUser: boolean mutedByInstance: boolean mutedServerByUser: boolean @@ -14,7 +18,7 @@ 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) || this.GET_DEFAULT_AVATAR_URL() + return Actor.GET_ACTOR_AVATAR_URL(actor) } static GET_DEFAULT_AVATAR_URL () { @@ -24,14 +28,14 @@ export class Account extends Actor implements ServerAccount { constructor (hash: ServerAccount) { super(hash) - this.updateComputedAttributes() - this.displayName = hash.displayName this.description = hash.description this.userId = hash.userId this.nameWithHost = Actor.CREATE_BY_STRING(this.name, this.host) this.nameWithHostForced = Actor.CREATE_BY_STRING(this.name, this.host, true) + if (hash.updatedAt) this.updatedAt = new Date(hash.updatedAt.toString()) + this.mutedByUser = false this.mutedByInstance = false this.mutedServerByUser = false @@ -40,16 +44,9 @@ export class Account extends Actor implements ServerAccount { updateAvatar (newAvatar: ActorImage) { this.avatar = newAvatar - - this.updateComputedAttributes() } resetAvatar () { this.avatar = null - this.avatarUrl = Account.GET_DEFAULT_AVATAR_URL() - } - - private updateComputedAttributes () { - this.avatarUrl = Account.GET_ACTOR_AVATAR_URL(this) } }