From: Chocobozzz <me@florianbigard.com>
Date: Fri, 10 Jan 2020 09:30:08 +0000 (+0100)
Subject: Fix default avatar URL
X-Git-Tag: v2.1.0-rc.1~45
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=62fca05de45848f3241c1b078df51d79692ebfee;hp=dce659fa7cb2b0f814e454a7a5c6860f9c37b39e;p=github%2FChocobozzz%2FPeerTube.git

Fix default avatar URL
---

diff --git a/client/src/app/shared/actor/actor.model.ts b/client/src/app/shared/actor/actor.model.ts
index 9cc51b948..0e5060f67 100644
--- a/client/src/app/shared/actor/actor.model.ts
+++ b/client/src/app/shared/actor/actor.model.ts
@@ -20,7 +20,7 @@ export abstract class Actor implements ActorServer {
 
     if (actor && actor.avatar) return absoluteAPIUrl + actor.avatar.path
 
-    this.GET_DEFAULT_AVATAR_URL()
+    return this.GET_DEFAULT_AVATAR_URL()
   }
 
   static GET_DEFAULT_AVATAR_URL () {
diff --git a/client/src/app/videos/+video-watch/video-watch.component.html b/client/src/app/videos/+video-watch/video-watch.component.html
index 9f1b51b2d..bc3a3ffdd 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.html
+++ b/client/src/app/videos/+video-watch/video-watch.component.html
@@ -145,6 +145,7 @@
           <div class="pt-3 border-top video-info-channel d-flex">
             <div class="video-info-channel-left d-flex">
               <avatar-channel [video]="video"></avatar-channel>
+
               <div class="video-info-channel-left-links ml-1">
                 <a [routerLink]="[ '/video-channels', video.byVideoChannel ]" i18n-title title="Go the channel page">
                   {{ video.channel.displayName }}
@@ -230,7 +231,7 @@
         <div class="video-attribute">
           <span i18n class="video-attribute-label">Duration</span>
           <span class="video-attribute-value">{{ video.duration | myVideoDurationFormatter }}</span>
-        </div>  
+        </div>
       </div>
 
       <my-video-comments
diff --git a/shared/extra-utils/cli/cli.ts b/shared/extra-utils/cli/cli.ts
index d532b62b0..54d05e9c6 100644
--- a/shared/extra-utils/cli/cli.ts
+++ b/shared/extra-utils/cli/cli.ts
@@ -6,7 +6,7 @@ function getEnvCli (server?: ServerInfo) {
   return `NODE_ENV=test NODE_APP_INSTANCE=${server.serverNumber}`
 }
 
-async function execCLI (command: string,) {
+async function execCLI (command: string) {
   return new Promise<string>((res, rej) => {
     exec(command, (err, stdout, stderr) => {
       if (err) return rej(err)