6 files changed, 16 insertions, 16 deletions

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 0bab18d37..ee7bbec74 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.html
+++ b/client/src/app/videos/+video-watch/video-watch.component.html
@@ -42,8 +42,8 @@
   </div>
 
   <div class="row video-small-blocks">
-    <div class="col-xs-5 col-xs-3 col-md-3 video-small-block video-small-block-author">
-      <a class="option" title="Access to all videos of this user" [routerLink]="['/videos/list', { field: 'author', search: video.author }]">
+    <div class="col-xs-5 col-xs-3 col-md-3 video-small-block video-small-block-account">
+      <a class="option" title="Access to all videos of this user" [routerLink]="['/videos/list', { field: 'account', search: video.account }]">
         <span class="glyphicon glyphicon-user"></span>
         <span class="video-small-block-text">{{ video.by }}</span>
       </a>
diff --git a/client/src/app/videos/+video-watch/video-watch.component.scss b/client/src/app/videos/+video-watch/video-watch.component.scss
index 1a59a1bd3..fcad7f7b0 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.scss
+++ b/client/src/app/videos/+video-watch/video-watch.component.scss
@@ -104,7 +104,7 @@
       border-style: solid;
     }
 
-    .video-small-block-author, .video-small-block-more {
+    .video-small-block-account, .video-small-block-more {
       a.option {
         display: block;
 
@@ -234,7 +234,7 @@
         font-size: 18px !important;
       }
 
-      .video-small-block-author {
+      .video-small-block-account {
         padding-left: 10px;
         padding-right: 10px;
       }
@@ -267,7 +267,7 @@
         font-size: 10px !important;
       }
 
-      .video-small-block-author {
+      .video-small-block-account {
         padding-left: 5px;
         padding-right: 5px;
       }
diff --git a/client/src/app/videos/shared/video-details.model.ts b/client/src/app/videos/shared/video-details.model.ts
index 84f96a25f..f4ae64dc1 100644
--- a/client/src/app/videos/shared/video-details.model.ts
+++ b/client/src/app/videos/shared/video-details.model.ts
@@ -10,7 +10,7 @@ import {
 } from '../../../../../shared'
 
 export class VideoDetails extends Video implements VideoDetailsServerModel {
-  author: string
+  account: string
   by: string
   createdAt: Date
   updatedAt: Date
@@ -71,7 +71,7 @@ export class VideoDetails extends Video implements VideoDetailsServerModel {
   }
 
   isRemovableBy (user: AuthUser) {
-    return user && this.isLocal === true && (this.author === user.username || user.hasRight(UserRight.REMOVE_ANY_VIDEO))
+    return user && this.isLocal === true && (this.account === user.username || user.hasRight(UserRight.REMOVE_ANY_VIDEO))
   }
 
   isBlackistableBy (user: AuthUser) {
@@ -79,6 +79,6 @@ export class VideoDetails extends Video implements VideoDetailsServerModel {
   }
 
   isUpdatableBy (user: AuthUser) {
-    return user && this.isLocal === true && user.username === this.author
+    return user && this.isLocal === true && user.username === this.account
   }
 }
diff --git a/client/src/app/videos/shared/video.model.ts b/client/src/app/videos/shared/video.model.ts
index 7f2871032..2cad4a04e 100644
--- a/client/src/app/videos/shared/video.model.ts
+++ b/client/src/app/videos/shared/video.model.ts
@@ -2,7 +2,7 @@ import { Video as VideoServerModel } from '../../../../../shared'
 import { User } from '../../shared'
 
 export class Video implements VideoServerModel {
-  author: string
+  account: string
   by: string
   createdAt: Date
   updatedAt: Date
@@ -32,8 +32,8 @@ export class Video implements VideoServerModel {
   dislikes: number
   nsfw: boolean
 
-  private static createByString (author: string, podHost: string) {
-    return author + '@' + podHost
+  private static createByString (account: string, podHost: string) {
+    return account + '@' + podHost
   }
 
   private static createDurationString (duration: number) {
@@ -52,7 +52,7 @@ export class Video implements VideoServerModel {
       absoluteAPIUrl = window.location.origin
     }
 
-    this.author = hash.author
+    this.account = hash.account
     this.createdAt = new Date(hash.createdAt.toString())
     this.categoryLabel = hash.categoryLabel
     this.category = hash.category
@@ -80,7 +80,7 @@ export class Video implements VideoServerModel {
     this.dislikes = hash.dislikes
     this.nsfw = hash.nsfw
 
-    this.by = Video.createByString(hash.author, hash.podHost)
+    this.by = Video.createByString(hash.account, hash.podHost)
   }
 
   isVideoNSFWForUser (user: User) {
diff --git a/client/src/app/videos/video-list/shared/video-miniature.component.html b/client/src/app/videos/video-list/shared/video-miniature.component.html
index abe87025f..6bbd29666 100644
--- a/client/src/app/videos/video-list/shared/video-miniature.component.html
+++ b/client/src/app/videos/video-list/shared/video-miniature.component.html
@@ -27,7 +27,7 @@
       </span>
     </div>
 
-    <a [routerLink]="['/videos/list', { field: 'author', search: video.author, sort: currentSort }]" class="video-miniature-author">{{ video.by }}</a>
+    <a [routerLink]="['/videos/list', { field: 'account', search: video.account, sort: currentSort }]" class="video-miniature-account">{{ video.by }}</a>
     <span class="video-miniature-created-at">{{ video.createdAt | date:'short' }}</span>
   </div>
 </div>
diff --git a/client/src/app/videos/video-list/shared/video-miniature.component.scss b/client/src/app/videos/video-list/shared/video-miniature.component.scss
index e2602d3b6..507ace098 100644
--- a/client/src/app/videos/video-list/shared/video-miniature.component.scss
+++ b/client/src/app/videos/video-list/shared/video-miniature.component.scss
@@ -81,7 +81,7 @@
       }
     }
 
-    .video-miniature-author, .video-miniature-created-at {
+    .video-miniature-account, .video-miniature-created-at {
       display: block;
       margin-left: 1px;
       font-size: 11px;
@@ -89,7 +89,7 @@
       opacity: 0.9;
     }
 
-    .video-miniature-author {
+    .video-miniature-account {
       transition: color 0.2s;
 
       &:hover {