Add ability to mute user when banning them

[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 c105a88ac608fb7a8205006a47f5947c9196eca0..a54f51aa4c22897947346164bbacb888420c3a95 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,29 +1,34 @@
-import { Actor as ActorServer, ActorImage } from '@shared/models'
 import { getAbsoluteAPIUrl } 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: 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 avatar = actor.avatars.sort((a, b) => a.width - b.width).find(a => a.width >= size)
 
-    if (actor && actor.avatar) {
-      const absoluteAPIUrl = getAbsoluteAPIUrl()
+    if (!avatar) return ''
+    if (avatar.url) return avatar.url
+
+    const absoluteAPIUrl = getAbsoluteAPIUrl()
 
-      return absoluteAPIUrl + actor.avatar.path
-    }
+    return absoluteAPIUrl + avatar.path
   }
 
   static CREATE_BY_STRING (accountName: string, host: string, forceHostname = false) {
@@ -42,18 +47,17 @@ export abstract class Actor implements ActorServer {
     return host.trim() === thisHost
   }
 
-  protected constructor (hash: ActorServer) {
+  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
+    this.avatars = hash.avatars
     this.isLocal = Actor.IS_LOCAL(this.host)
   }
 }