Add support to video support on client

[github/Chocobozzz/PeerTube.git] / client / src / app / shared / account / account.model.ts

diff --git a/client/src/app/shared/account/account.model.ts b/client/src/app/shared/account/account.model.ts
index bacaa208ada837b33cfd6c352b4b207a012daca8..0bdc76478264fc3743fd249df37e048f2b38e162 100644 (file)
--- a/client/src/app/shared/account/account.model.ts
+++ b/client/src/app/shared/account/account.model.ts
@@ -1,11 +1,14 @@
 import { Account as ServerAccount } from '../../../../../shared/models/actors/account.model'
 import { Avatar } from '../../../../../shared/models/avatars/avatar.model'
-import { environment } from '../../../environments/environment'
+import { getAbsoluteAPIUrl } from '../misc/utils'
 
 export class Account implements ServerAccount {
   id: number
   uuid: string
+  url: string
   name: string
+  displayName: string
+  description: string
   host: string
   followingCount: number
   followersCount: number
@@ -13,9 +16,20 @@ export class Account implements ServerAccount {
   updatedAt: Date
   avatar: Avatar
 
-  static GET_ACCOUNT_AVATAR_PATH (account: Account) {
-    if (account && account.avatar) return account.avatar.path
+  static GET_ACCOUNT_AVATAR_URL (account: Account) {
+    const absoluteAPIUrl = getAbsoluteAPIUrl()
 
-    return '/client/assets/images/default-avatar.png'
+    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
   }
 }