X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fshared%2Factor%2Factor.model.ts;h=a78303a2f9f1aacdddb20a72bba24644831e6e60;hb=5fb2e2888ce032c638e4b75d07458642f0833e52;hp=56ff780b78d10272ca4460dd3c5dc455fcdd76aa;hpb=d3e91a5f72ac9c986cdb67d7d6c85bb4819e680c;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/shared/actor/actor.model.ts b/client/src/app/shared/actor/actor.model.ts
index 56ff780b7..a78303a2f 100644
--- a/client/src/app/shared/actor/actor.model.ts
+++ b/client/src/app/shared/actor/actor.model.ts
@@ -1,41 +1,47 @@
 import { Actor as ActorServer } from '../../../../../shared/models/actors/actor.model'
-import { getAbsoluteAPIUrl } from '@app/shared/misc/utils'
 import { Avatar } from '../../../../../shared/models/avatars/avatar.model'
+import { getAbsoluteAPIUrl } from '@app/shared/misc/utils'
 
 export abstract class Actor implements ActorServer {
   id: number
-  uuid: string
   url: string
   name: string
   host: string
   followingCount: number
   followersCount: number
-  createdAt: Date
-  updatedAt: Date
+  createdAt: Date | string
+  updatedAt: Date | string
   avatar: Avatar
 
   avatarUrl: string
 
-  static GET_ACTOR_AVATAR_URL (actor: { avatar: Avatar }) {
-    const absoluteAPIUrl = getAbsoluteAPIUrl()
+  static GET_ACTOR_AVATAR_URL (actor: { avatar?: Avatar }) {
+    if (actor?.avatar?.url) return actor.avatar.url
 
-    if (actor && actor.avatar) return absoluteAPIUrl + actor.avatar.path
+    if (actor && actor.avatar) {
+      const absoluteAPIUrl = getAbsoluteAPIUrl()
+
+      return absoluteAPIUrl + actor.avatar.path
+    }
+
+    return this.GET_DEFAULT_AVATAR_URL()
+  }
 
+  static GET_DEFAULT_AVATAR_URL () {
     return window.location.origin + '/client/assets/images/default-avatar.png'
   }
 
-  static CREATE_BY_STRING (accountName: string, host: string) {
+  static CREATE_BY_STRING (accountName: string, host: string, forceHostname = false) {
     const absoluteAPIUrl = getAbsoluteAPIUrl()
     const thisHost = new URL(absoluteAPIUrl).host
 
-    if (host.trim() === thisHost) return accountName
+    if (host.trim() === thisHost && !forceHostname) return accountName
 
     return accountName + '@' + host
   }
 
   protected constructor (hash: ActorServer) {
     this.id = hash.id
-    this.uuid = hash.uuid
     this.url = hash.url
     this.name = hash.name
     this.host = hash.host
@@ -45,6 +51,16 @@ export abstract class Actor implements ActorServer {
     this.updatedAt = new Date(hash.updatedAt.toString())
     this.avatar = hash.avatar
 
+    this.updateComputedAttributes()
+  }
+
+  updateAvatar (newAvatar: Avatar) {
+    this.avatar = newAvatar
+
+    this.updateComputedAttributes()
+  }
+
+  private updateComputedAttributes () {
     this.avatarUrl = Actor.GET_ACTOR_AVATAR_URL(this)
   }
 }