X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fshared%2Faccount%2Faccount.model.ts;h=6a3c6451c420fe0bee8690a4e04149b177987d5d;hb=5fcbd89841be29b373c6e4c8eeaa1f27414c8c7d;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..6a3c6451c 100644 --- a/client/src/app/shared/account/account.model.ts +++ b/client/src/app/shared/account/account.model.ts @@ -1,50 +1,14 @@ 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 - } 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 } }