From 7d026caf683e42fd57a243a3b52a5e4f476fbb4e Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 28 Apr 2021 15:59:46 +0200 Subject: Remove avatarUrl from models --- client/src/app/shared/shared-main/account/account.model.ts | 9 --------- client/src/app/shared/shared-main/account/actor.model.ts | 1 - 2 files changed, 10 deletions(-) (limited to 'client/src/app/shared/shared-main/account') 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 c90bafa5c..6d9f0ee65 100644 --- a/client/src/app/shared/shared-main/account/account.model.ts +++ b/client/src/app/shared/shared-main/account/account.model.ts @@ -24,8 +24,6 @@ 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 @@ -40,16 +38,9 @@ export class Account extends Actor implements ServerAccount { updateAvatar (newAvatar: ActorImage) { this.avatar = newAvatar - - this.updateComputedAttributes() } resetAvatar () { this.avatar = null - this.avatarUrl = null - } - - private updateComputedAttributes () { - this.avatarUrl = Account.GET_ACTOR_AVATAR_URL(this) } } 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 4b036341f..6ba0bb09e 100644 --- a/client/src/app/shared/shared-main/account/actor.model.ts +++ b/client/src/app/shared/shared-main/account/actor.model.ts @@ -15,7 +15,6 @@ export abstract class Actor implements ServerActor { updatedAt: Date | string avatar: ActorImage - avatarUrl: string isLocal: boolean -- cgit v1.2.3