Merge branch 'develop' into shorter-URLs-channels-accounts

[github/Chocobozzz/PeerTube.git] / client / src / app / shared / shared-actor-image / actor-avatar.component.ts

diff --git a/client/src/app/shared/shared-actor-image/actor-avatar.component.ts b/client/src/app/shared/shared-actor-image/actor-avatar.component.ts
index e74dd163484105e34b3c3058c30b1053e27bc7f6..b06c2bae6547cf6946e5da965fcccf24fcffdd36 100644 (file)
--- a/client/src/app/shared/shared-actor-image/actor-avatar.component.ts
+++ b/client/src/app/shared/shared-actor-image/actor-avatar.component.ts
@@ -55,8 +55,8 @@ export class ActorAvatarComponent {
 
     if (this.size) base.push(`avatar-${this.size}`)
 
-    if (this.account) base.push('account')
-    else base.push('channel')
+    if (this.channel) base.push('channel')
+    else base.push('account')
 
     if (type === 'initial' && this.initial) {
       base.push('initial')
@@ -67,10 +67,9 @@ export class ActorAvatarComponent {
   }
 
   get defaultAvatarUrl () {
-    if (this.account) Account.GET_DEFAULT_AVATAR_URL()
     if (this.channel) return VideoChannel.GET_DEFAULT_AVATAR_URL()
 
-    return ''
+    return Account.GET_DEFAULT_AVATAR_URL()
   }
 
   get avatarUrl () {