3 files changed, 41 insertions, 6 deletions

diff --git a/client/src/app/+admin/overview/videos/video-list.component.html b/client/src/app/+admin/overview/videos/video-list.component.html
index 1f1e9cc6e..6250c00fb 100644
--- a/client/src/app/+admin/overview/videos/video-list.component.html
+++ b/client/src/app/+admin/overview/videos/video-list.component.html
@@ -63,10 +63,17 @@
         <my-video-cell [video]="video"></my-video-cell>
       </td>
 
-      <td>
-        <span class="badge badge-blue" i18n>{{ video.privacy.label }}</span>
+      <td class="badges">
+        <span [ngClass]="getPrivacyBadgeClass(video.privacy.id)" class="badge" i18n>{{ video.privacy.label }}</span>
+
         <span *ngIf="video.nsfw" class="badge badge-red" i18n>NSFW</span>
-        <span *ngIf="video.blocked" class="badge badge-red" i18n>NSFW</span>
+
+        <span *ngIf="isUnpublished(video.state.id)" class="badge badge-yellow" i18n>Not published yet</span>
+
+        <span *ngIf="isAccountBlocked(video)" class="badge badge-red" i18n>Account muted</span>
+        <span *ngIf="isServerBlocked(video)" class="badge badge-red" i18n>Server muted</span>
+
+        <span *ngIf="isVideoBlocked(video)" class="badge badge-red" i18n>Blocked</span>
       </td>
 
       <td>
diff --git a/client/src/app/+admin/overview/videos/video-list.component.scss b/client/src/app/+admin/overview/videos/video-list.component.scss
index fcdb457f2..250a917e4 100644
--- a/client/src/app/+admin/overview/videos/video-list.component.scss
+++ b/client/src/app/+admin/overview/videos/video-list.component.scss
@@ -7,4 +7,6 @@ my-embed {
 
 .badge {
   @include table-badge;
+
+  margin-right: 5px;
 }
diff --git a/client/src/app/+admin/overview/videos/video-list.component.ts b/client/src/app/+admin/overview/videos/video-list.component.ts
index a445bc209..dd9225e6a 100644
--- a/client/src/app/+admin/overview/videos/video-list.component.ts
+++ b/client/src/app/+admin/overview/videos/video-list.component.ts
@@ -3,7 +3,7 @@ import { Component, OnInit } from '@angular/core'
 import { ActivatedRoute, Router } from '@angular/router'
 import { AuthService, ConfirmService, Notifier, RestPagination, RestTable } from '@app/core'
 import { DropdownAction, Video, VideoService } from '@app/shared/shared-main'
-import { UserRight } from '@shared/models'
+import { UserRight, VideoPrivacy, VideoState } from '@shared/models'
 import { AdvancedInputFilter } from '@app/shared/shared-forms'
 import { VideoActionsDisplayType } from '@app/shared/shared-video-miniature'
 
@@ -28,8 +28,12 @@ export class VideoListComponent extends RestTable implements OnInit {
       title: $localize`Advanced filters`,
       children: [
         {
-          queryParams: { search: 'local:true' },
-          label: $localize`Only local videos`
+          queryParams: { search: 'isLocal:false' },
+          label: $localize`Remote videos`
+        },
+        {
+          queryParams: { search: 'isLocal:true' },
+          label: $localize`Local videos`
         }
       ]
     }
@@ -88,6 +92,28 @@ export class VideoListComponent extends RestTable implements OnInit {
     this.reloadData()
   }
 
+  getPrivacyBadgeClass (privacy: VideoPrivacy) {
+    if (privacy === VideoPrivacy.PUBLIC) return 'badge-blue'
+
+    return 'badge-yellow'
+  }
+
+  isUnpublished (state: VideoState) {
+    return state !== VideoState.PUBLISHED
+  }
+
+  isAccountBlocked (video: Video) {
+    return video.blockedOwner
+  }
+
+  isServerBlocked (video: Video) {
+    return video.blockedServer
+  }
+
+  isVideoBlocked (video: Video) {
+    return video.blacklisted
+  }
+
   protected reloadData () {
     this.selectedVideos = []