X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fshared%2Faccount%2Faccount.model.ts;h=5058e372fd9505ecf99fe1d1c191417d99285b92;hb=614d1ae928ec307b708c4a3eb423797353b1df2a;hp=10a70ac31abf46d0e3400c79b696f9ccb487efda;hpb=6b738c7a31591a83fdcd9c78b6b1f98e543c378b;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/shared/account/account.model.ts b/client/src/app/shared/account/account.model.ts
index 10a70ac31..5058e372f 100644
--- a/client/src/app/shared/account/account.model.ts
+++ b/client/src/app/shared/account/account.model.ts
@@ -1,50 +1,16 @@
 import { Account as ServerAccount } from '../../../../../shared/models/actors/account.model'
-import { Avatar } from '../../../../../shared/models/avatars/avatar.model'
-import { getAbsoluteAPIUrl } from '../misc/utils'
+import { Actor } from '../actor/actor.model'
 
-export class Account implements ServerAccount {
-  id: number
-  uuid: string
-  url: string
-  name: string
+export class Account extends Actor implements ServerAccount {
   displayName: string
   description: string
-  host: string
-  followingCount: number
-  followersCount: number
-  createdAt: Date
-  updatedAt: Date
-  avatar: Avatar
-
-  static GET_ACCOUNT_AVATAR_URL (account: Account) {
-    const absoluteAPIUrl = getAbsoluteAPIUrl()
-
-    if (account && account.avatar) return absoluteAPIUrl + account.avatar.path
-
-    return window.location.origin + '/client/assets/images/default-avatar.png'
-  }
-
-  static CREATE_BY_STRING (accountName: string, host: string) {
-    const absoluteAPIUrl = getAbsoluteAPIUrl()
-    const thisHost = new URL(absoluteAPIUrl).host
-
-    if (host.trim() === thisHost) return accountName
-
-    return accountName + '@' + host
-  }
+  nameWithHost: string
 
   constructor (hash: ServerAccount) {
-    this.id = hash.id
-    this.uuid = hash.uuid
-    this.url = hash.url
-    this.name = hash.name
+    super(hash)
+
     this.displayName = hash.displayName
     this.description = hash.description
-    this.host = hash.host
-    this.followingCount = hash.followingCount
-    this.followersCount = hash.followersCount
-    this.createdAt = new Date(hash.createdAt.toString())
-    this.updatedAt = new Date(hash.updatedAt.toString())
-    this.avatar = hash.avatar
+    this.nameWithHost = Actor.CREATE_BY_STRING(this.name, this.host)
   }
 }