X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fshared%2Fshared-main%2Faccount%2Factor.model.ts;h=6e45ba588355b539f3b36a7e4500fae97e965e9f;hb=2b621ac0ebe83693bba6354b3482a03ba58143e7;hp=1ee0c297ed805a90a8cbea1cfcea54b51bf4a03b;hpb=27ec473f5306621643fcb169be7cfe6b15136265;p=github%2FChocobozzz%2FPeerTube.git

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 1ee0c297e..6e45ba588 100644
--- a/client/src/app/shared/shared-main/account/actor.model.ts
+++ b/client/src/app/shared/shared-main/account/actor.model.ts
@@ -1,7 +1,7 @@
-import { Actor as ActorServer, ActorImage } 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
   name: string
 
@@ -12,28 +12,31 @@ export abstract class Actor implements ActorServer {
   followersCount: number
 
   createdAt: Date | string
-  updatedAt: Date | string
 
-  avatar: ActorImage
-  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)
+
+    const avatar = size
+      ? avatarsAscWidth.find(a => a.width >= size)
+      : avatarsAscWidth[avatarsAscWidth.length - 1] // Bigger one
 
-    if (actor && actor.avatar) {
-      const absoluteAPIUrl = getAbsoluteAPIUrl()
+    if (!avatar) return ''
+    if (avatar.url) return avatar.url
 
-      return absoluteAPIUrl + actor.avatar.path
-    }
+    const absoluteAPIUrl = getAbsoluteAPIUrl()
 
-    return ''
+    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
 
@@ -41,13 +44,12 @@ export abstract class Actor implements ActorServer {
   }
 
   static IS_LOCAL (host: string) {
-    const absoluteAPIUrl = getAbsoluteAPIUrl()
-    const thisHost = new URL(absoluteAPIUrl).host
+    const thisHost = getAPIHost()
 
     return host.trim() === thisHost
   }
 
-  protected constructor (hash: Partial<ActorServer>) {
+  protected constructor (hash: Partial<ServerActor>) {
     this.id = hash.id
     this.url = hash.url ?? ''
     this.name = hash.name ?? ''
@@ -56,9 +58,8 @@ export abstract class Actor implements ActorServer {
     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
+    this.avatars = hash.avatars || []
     this.isLocal = Actor.IS_LOCAL(this.host)
   }
 }