First implem global search

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

diff --git a/client/src/app/shared/actor/actor.model.ts b/client/src/app/shared/actor/actor.model.ts
index 9cc51b9489027cac44e8ee6713532899a4603870..a78303a2f9f1aacdddb20a72bba24644831e6e60 100644 (file)
--- a/client/src/app/shared/actor/actor.model.ts
+++ b/client/src/app/shared/actor/actor.model.ts
@@ -15,12 +15,16 @@ export abstract class Actor implements ActorServer {
 
   avatarUrl: string
 
-  static GET_ACTOR_AVATAR_URL (actor: { avatar?: { path: string } }) {
-    const absoluteAPIUrl = getAbsoluteAPIUrl()
+  static GET_ACTOR_AVATAR_URL (actor: { avatar?: Avatar }) {
+    if (actor?.avatar?.url) return actor.avatar.url
+
+    if (actor && actor.avatar) {
+      const absoluteAPIUrl = getAbsoluteAPIUrl()
 
-    if (actor && actor.avatar) return absoluteAPIUrl + actor.avatar.path
+      return absoluteAPIUrl + actor.avatar.path
+    }
 
-    this.GET_DEFAULT_AVATAR_URL()
+    return this.GET_DEFAULT_AVATAR_URL()
   }
 
   static GET_DEFAULT_AVATAR_URL () {