Merge branch 'release/4.2.0' into develop

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

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 bda88bdeef44ccd61066d973046b8c1a3763f6f7..6e45ba588355b539f3b36a7e4500fae97e965e9f 100644 (file)
--- a/client/src/app/shared/shared-main/account/actor.model.ts
+++ b/client/src/app/shared/shared-main/account/actor.model.ts
@@ -1,73 +1,65 @@
-import { Actor as ActorServer, Avatar } from '@shared/models'
-import { getAbsoluteAPIUrl } from '@app/helpers'
+import { getAbsoluteAPIUrl, getAPIHost } from '@app/helpers'
+import { Actor as ServerActor, ActorImage } from '@shared/models'
 
-export abstract class Actor implements ActorServer {
+export abstract class Actor implements ServerActor {
   id: number
-  url: string
   name: string
+
   host: string
+  url: string
+
   followingCount: number
   followersCount: number
+
   createdAt: Date | string
-  updatedAt: Date | string
-  avatar: Avatar
 
-  avatarUrl: string
+  // TODO: remove, deprecated in 4.2
+  avatar: never
+
+  avatars: ActorImage[]
 
   isLocal: boolean
 
-  static GET_ACTOR_AVATAR_URL (actor: { avatar?: { url?: string, path: string } }) {
-    if (actor?.avatar?.url) return actor.avatar.url
+  static GET_ACTOR_AVATAR_URL (actor: { avatars: { width: number, url?: string, path: string }[] }, size?: number) {
+    const avatarsAscWidth = actor.avatars.sort((a, b) => a.width - b.width)
 
-    if (actor && actor.avatar) {
-      const absoluteAPIUrl = getAbsoluteAPIUrl()
+    const avatar = size
+      ? avatarsAscWidth.find(a => a.width >= size)
+      : avatarsAscWidth[avatarsAscWidth.length - 1] // Bigger one
 
-      return absoluteAPIUrl + actor.avatar.path
-    }
+    if (!avatar) return ''
+    if (avatar.url) return avatar.url
 
-    return this.GET_DEFAULT_AVATAR_URL()
-  }
+    const absoluteAPIUrl = getAbsoluteAPIUrl()
 
-  static GET_DEFAULT_AVATAR_URL () {
-    return window.location.origin + '/client/assets/images/default-avatar.png'
+    return absoluteAPIUrl + avatar.path
   }
 
   static CREATE_BY_STRING (accountName: string, host: string, forceHostname = false) {
-    const absoluteAPIUrl = getAbsoluteAPIUrl()
-    const thisHost = new URL(absoluteAPIUrl).host
+    const thisHost = getAPIHost()
 
     if (host.trim() === thisHost && !forceHostname) return accountName
 
     return accountName + '@' + host
   }
 
-  protected constructor (hash: ActorServer) {
+  static IS_LOCAL (host: string) {
+    const thisHost = getAPIHost()
+
+    return host.trim() === thisHost
+  }
+
+  protected constructor (hash: Partial<ServerActor>) {
     this.id = hash.id
-    this.url = hash.url
-    this.name = hash.name
-    this.host = hash.host
+    this.url = hash.url ?? ''
+    this.name = hash.name ?? ''
+    this.host = hash.host ?? ''
     this.followingCount = hash.followingCount
     this.followersCount = hash.followersCount
 
     if (hash.createdAt) this.createdAt = new Date(hash.createdAt.toString())
-    if (hash.updatedAt) this.updatedAt = new Date(hash.updatedAt.toString())
-
-    this.avatar = hash.avatar
-
-    const absoluteAPIUrl = getAbsoluteAPIUrl()
-    const thisHost = new URL(absoluteAPIUrl).host
-    this.isLocal = this.host.trim() === thisHost
-
-    this.updateComputedAttributes()
-  }
-
-  updateAvatar (newAvatar: Avatar) {
-    this.avatar = newAvatar
-
-    this.updateComputedAttributes()
-  }
 
-  private updateComputedAttributes () {
-    this.avatarUrl = Actor.GET_ACTOR_AVATAR_URL(this)
+    this.avatars = hash.avatars || []
+    this.isLocal = Actor.IS_LOCAL(this.host)
   }
 }