52 files changed, 564 insertions, 591 deletions
diff --git a/client/src/app/+admin/admin.component.ts b/client/src/app/+admin/admin.component.ts
index 9662522dc..4cf3da0e8 100644
--- a/client/src/app/+admin/admin.component.ts
+++ b/client/src/app/+admin/admin.component.ts
@@ -18,7 +18,7 @@ export class AdminComponent implements OnInit {
  ngOnInit () {
    if (this.hasUsersRight()) this.items.push({ label: this.i18n('Users'), routerLink: '/admin/users' })
    if (this.hasServerFollowRight()) this.items.push({ label: this.i18n('Follows & redundancies'), routerLink: '/admin/follows' })
-    if (this.hasVideoAbusesRight() || this.hasVideoBlacklistRight()) this.items.push({ label: this.i18n('Moderation'), routerLink: '/admin/moderation' })
+    if (this.hasVideoAbusesRight() || this.hasVideoBlocklistRight()) this.items.push({ label: this.i18n('Moderation'), routerLink: '/admin/moderation' })
    if (this.hasConfigRight()) this.items.push({ label: this.i18n('Configuration'), routerLink: '/admin/config' })
    if (this.hasPluginsRight()) this.items.push({ label: this.i18n('Plugins/Themes'), routerLink: '/admin/plugins' })
    if (this.hasJobsRight() || this.hasLogsRight() || this.hasDebugRight()) this.items.push({ label: this.i18n('System'), routerLink: '/admin/system' })
@@ -36,8 +36,8 @@ export class AdminComponent implements OnInit {
    return this.auth.getUser().hasRight(UserRight.MANAGE_VIDEO_ABUSES)
  }
-  hasVideoBlacklistRight () {
+  hasVideoBlocklistRight () {
-    return this.auth.getUser().hasRight(UserRight.MANAGE_VIDEO_BLACKLIST)
+    return this.auth.getUser().hasRight(UserRight.MANAGE_VIDEO_BLOCKS)
  }
  hasConfigRight () {
diff --git a/client/src/app/+admin/admin.module.ts b/client/src/app/+admin/admin.module.ts
index d04313c0a..eb073f709 100644
--- a/client/src/app/+admin/admin.module.ts
+++ b/client/src/app/+admin/admin.module.ts
@@ -11,8 +11,7 @@ import { UserCreateComponent, UserListComponent, UserPasswordComponent, UsersCom
 import {
  ModerationCommentModalComponent,
  VideoAbuseListComponent,
-  VideoAutoBlacklistListComponent,
+  VideoBlockListComponent
-  VideoBlacklistListComponent
 } from './moderation'
 import { ModerationComponent } from '@app/+admin/moderation/moderation.component'
 import { RedundancyCheckboxComponent } from '@app/+admin/follows/shared/redundancy-checkbox.component'
@@ -59,10 +58,9 @@ import { VideoAbuseDetailsComponent } from './moderation/video-abuse-list/video-
    UserListComponent,
    ModerationComponent,
-    VideoBlacklistListComponent,
+    VideoBlockListComponent,
    VideoAbuseListComponent,
    VideoAbuseDetailsComponent,
-    VideoAutoBlacklistListComponent,
    ModerationCommentModalComponent,
    InstanceServerBlocklistComponent,
    InstanceAccountBlocklistComponent,
diff --git a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
index 981b6685f..52c759fb7 100644
--- a/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
+++ b/client/src/app/+admin/config/edit-custom-config/edit-custom-config.component.html
@@ -430,7 +430,7 @@
                  <div class="form-group">
                    <my-peertube-checkbox
                      inputName="autoBlacklistVideosOfUsersEnabled" formControlName="enabled"
-                      i18n-labelText labelText="Blacklist new videos automatically"
+                      i18n-labelText labelText="Block new videos automatically"
                    >
                    <ng-container ngProjectAs="description">
                      <span i18n>Unless a user is marked as trusted, their videos will stay private until a moderator reviews them.</span>
@@ -671,16 +671,16 @@
                <div class="form-group">
                  <my-peertube-checkbox inputName="servicesTwitterWhitelisted" formControlName="whitelisted">
                    <ng-template ptTemplate="label">
-                      <ng-container i18n>Instance whitelisted by Twitter</ng-container>
+                      <ng-container i18n>Instance allowed by Twitter</ng-container>
                    </ng-template>
                    <ng-template ptTemplate="help">
                      <ng-container i18n>
-                        If your instance is whitelisted by Twitter, a video player will be embedded in the Twitter feed on PeerTube video share.<br />
+                        If your instance is explicitly allowed by Twitter, a video player will be embedded in the Twitter feed on PeerTube video share.<br />
-                        If the instance is not whitelisted, we use an image link card that will redirect on your PeerTube instance.<br /><br />
+                        If the instance is not, we use an image link card that will redirect on your PeerTube instance.<br /><br />
                        Check this checkbox, save the configuration and test with a video URL of your instance (https://example.com/videos/watch/blabla) on
                        <a target='_blank' rel='noopener noreferrer' href='https://cards-dev.twitter.com/validator'>https://cards-dev.twitter.com/validator</a>
-                        to see if you instance is whitelisted.
+                        to see if you instance is allowed.
                      </ng-container>
                    </ng-template>
                  </my-peertube-checkbox>
diff --git a/client/src/app/+admin/moderation/index.ts b/client/src/app/+admin/moderation/index.ts
index 3c683a28c..e99244b74 100644
--- a/client/src/app/+admin/moderation/index.ts
+++ b/client/src/app/+admin/moderation/index.ts
@@ -1,5 +1,4 @@
 export * from './video-abuse-list'
-export * from './video-auto-blacklist-list'
+export * from './video-block-list'
-export * from './video-blacklist-list'
 export * from './moderation.component'
 export * from './moderation.routes'
diff --git a/client/src/app/+admin/moderation/moderation.component.html b/client/src/app/+admin/moderation/moderation.component.html
index b70027957..09f149c0e 100644
--- a/client/src/app/+admin/moderation/moderation.component.html
+++ b/client/src/app/+admin/moderation/moderation.component.html
@@ -2,11 +2,9 @@
  <div i18n class="form-sub-title">Moderation</div>
  <div class="admin-sub-nav">
-    <a *ngIf="hasVideoAbusesRight()" i18n routerLink="video-abuses/list" routerLinkActive="active">Video abuses</a>
+    <a *ngIf="hasVideoAbusesRight()" i18n routerLink="video-abuses/list" routerLinkActive="active">Video reports</a>
-    <a *ngIf="hasVideoBlacklistRight()" i18n routerLink="video-blacklist/list" routerLinkActive="active">{{ autoBlacklistVideosEnabled ? 'Manually blacklisted videos' : 'Blacklisted videos' }}</a>
+    <a *ngIf="hasVideoBlocklistRight()" i18n routerLink="video-blocks/list" routerLinkActive="active">Video blocks</a>
-    <a *ngIf="autoBlacklistVideosEnabled && hasVideoBlacklistRight()" i18n routerLink="video-auto-blacklist/list" routerLinkActive="active">Auto-blacklisted videos</a>
    <a *ngIf="hasAccountsBlocklistRight()" i18n routerLink="blocklist/accounts" routerLinkActive="active">Muted accounts</a>
diff --git a/client/src/app/+admin/moderation/moderation.component.ts b/client/src/app/+admin/moderation/moderation.component.ts
index 7744deb06..d48305eed 100644
--- a/client/src/app/+admin/moderation/moderation.component.ts
+++ b/client/src/app/+admin/moderation/moderation.component.ts
@@ -7,7 +7,7 @@ import { AuthService, ServerService } from '@app/core'
  styleUrls: [ './moderation.component.scss' ]
 })
 export class ModerationComponent implements OnInit {
-  autoBlacklistVideosEnabled = false
+  autoBlockVideosEnabled = false
  constructor (
    private auth: AuthService,
@@ -16,7 +16,7 @@ export class ModerationComponent implements OnInit {
  ngOnInit (): void {
    this.serverService.getConfig()
-      .subscribe(config => this.autoBlacklistVideosEnabled = config.autoBlacklist.videos.ofUsers.enabled)
+      .subscribe(config => this.autoBlockVideosEnabled = config.autoBlacklist.videos.ofUsers.enabled)
  }
@@ -24,8 +24,8 @@ export class ModerationComponent implements OnInit {
    return this.auth.getUser().hasRight(UserRight.MANAGE_VIDEO_ABUSES)
  }
-  hasVideoBlacklistRight () {
+  hasVideoBlocklistRight () {
-    return this.auth.getUser().hasRight(UserRight.MANAGE_VIDEO_BLACKLIST)
+    return this.auth.getUser().hasRight(UserRight.MANAGE_VIDEO_BLOCKS)
  }
  hasAccountsBlocklistRight () {
diff --git a/client/src/app/+admin/moderation/moderation.routes.ts b/client/src/app/+admin/moderation/moderation.routes.ts
index a024f2bee..aeb555c4a 100644
--- a/client/src/app/+admin/moderation/moderation.routes.ts
+++ b/client/src/app/+admin/moderation/moderation.routes.ts
@@ -2,8 +2,7 @@ import { Routes } from '@angular/router'
 import { UserRight } from '../../../../../shared'
 import { UserRightGuard } from '@app/core'
 import { VideoAbuseListComponent } from '@app/+admin/moderation/video-abuse-list'
-import { VideoBlacklistListComponent } from '@app/+admin/moderation/video-blacklist-list'
+import { VideoBlockListComponent } from '@app/+admin/moderation/video-block-list'
-import { VideoAutoBlacklistListComponent } from '@app/+admin/moderation/video-auto-blacklist-list'
 import { ModerationComponent } from '@app/+admin/moderation/moderation.component'
 import { InstanceAccountBlocklistComponent, InstanceServerBlocklistComponent } from '@app/+admin/moderation/instance-blocklist'
@@ -23,45 +22,44 @@ export const ModerationRoutes: Routes = [
        pathMatch: 'full'
      },
      {
-        path: 'video-blacklist',
-        redirectTo: 'video-blacklist/list',
-        pathMatch: 'full'
-      },
-      {
-        path: 'video-auto-blacklist',
-        redirectTo: 'video-auto-blacklist/list',
-        pathMatch: 'full'
-      },
-      {
        path: 'video-abuses/list',
        component: VideoAbuseListComponent,
        canActivate: [ UserRightGuard ],
        data: {
          userRight: UserRight.MANAGE_VIDEO_ABUSES,
          meta: {
-            title: 'Video abuses list'
+            title: 'Video reports'
          }
        }
      },
      {
+        path: 'video-blacklist',
+        redirectTo: 'video-blocks/list',
+        pathMatch: 'full'
+      },
+      {
+        path: 'video-auto-blacklist',
+        redirectTo: 'video-blocks/list',
+        pathMatch: 'full'
+      },
+      {
        path: 'video-auto-blacklist/list',
-        component: VideoAutoBlacklistListComponent,
+        redirectTo: 'video-blocks/list',
-        canActivate: [ UserRightGuard ],
+        pathMatch: 'full'
-        data: {
+      },
-          userRight: UserRight.MANAGE_VIDEO_BLACKLIST,
+      {
-          meta: {
+        path: 'video-blacklist',
-            title: 'Auto-blacklisted videos'
+        redirectTo: 'video-blocks/list',
-          }
+        pathMatch: 'full'
-        }
      },
      {
-        path: 'video-blacklist/list',
+        path: 'video-blocks/list',
-        component: VideoBlacklistListComponent,
+        component: VideoBlockListComponent,
        canActivate: [ UserRightGuard ],
        data: {
-          userRight: UserRight.MANAGE_VIDEO_BLACKLIST,
+          userRight: UserRight.MANAGE_VIDEO_BLOCKS,
          meta: {
-            title: 'Blacklisted videos'
+            title: 'Videos blocked'
          }
        }
      },
diff --git a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.html b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.html
index 2abcc0669..453a282d1 100644
--- a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.html
+++ b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.html
@@ -69,7 +69,7 @@
    <div class="screenratio">
      <div *ngIf="videoAbuse.video.deleted || videoAbuse.video.blacklisted">
        <span i18n *ngIf="videoAbuse.video.deleted">The video was deleted</span>
-        <span i18n *ngIf="!videoAbuse.video.deleted">The video was blacklisted</span>
+        <span i18n *ngIf="!videoAbuse.video.deleted">The video was blocked</span>
      </div>
      <div *ngIf="!videoAbuse.video.deleted && !videoAbuse.video.blacklisted" [innerHTML]="videoAbuse.embedHtml"></div>
    </div>
diff --git a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html
index d30475794..df15999ec 100644
--- a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html
+++ b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.html
@@ -19,7 +19,7 @@
              <a [routerLink]="[ '/admin/moderation/video-abuses/list' ]" [queryParams]="{ 'search': 'state:pending' }" class="dropdown-item" i18n>Unsolved reports</a>
              <a [routerLink]="[ '/admin/moderation/video-abuses/list' ]" [queryParams]="{ 'search': 'state:accepted' }" class="dropdown-item" i18n>Accepted reports</a>
              <a [routerLink]="[ '/admin/moderation/video-abuses/list' ]" [queryParams]="{ 'search': 'state:rejected' }" class="dropdown-item" i18n>Refused reports</a>
-              <a [routerLink]="[ '/admin/moderation/video-abuses/list' ]" [queryParams]="{ 'search': 'videoIs:blacklisted' }" class="dropdown-item" i18n>Reports with blacklisted videos</a>
+              <a [routerLink]="[ '/admin/moderation/video-abuses/list' ]" [queryParams]="{ 'search': 'videoIs:blacklisted' }" class="dropdown-item" i18n>Reports with blocked videos</a>
              <a [routerLink]="[ '/admin/moderation/video-abuses/list' ]" [queryParams]="{ 'search': 'videoIs:deleted' }" class="dropdown-item" i18n>Reports with deleted videos</a>
            </div>
          </div>
@@ -84,9 +84,9 @@
            </div>
            <div class="video-table-video-text">
              <div>
-                {{ videoAbuse.video.name }}
                <span *ngIf="!videoAbuse.video.blacklisted" class="glyphicon glyphicon-new-window"></span>
-                <span *ngIf="videoAbuse.video.blacklisted" i18n-title title="Video was blacklisted" class="glyphicon glyphicon-ban-circle"></span>
+                <span *ngIf="videoAbuse.video.blacklisted" i18n-title title="The video was blocked" class="glyphicon glyphicon-ban-circle"></span>
+                {{ videoAbuse.video.name }}
              </div>
              <div class="text-muted" i18n>by {{ videoAbuse.video.channel?.displayName }} on {{ videoAbuse.video.channel?.host }} </div>
            </div>
diff --git a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts
index 39f619cc3..ca37bccf3 100644
--- a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts
+++ b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts
@@ -3,7 +3,7 @@ import { Account } from '@app/shared/account/account.model'
 import { Notifier } from '@app/core'
 import { SortMeta } from 'primeng/api'
 import { VideoAbuse, VideoAbuseState } from '../../../../../../shared'
-import { RestPagination, RestTable, VideoAbuseService, VideoBlacklistService } from '../../../shared'
+import { RestPagination, RestTable, VideoAbuseService, VideoBlockService } from '../../../shared'
 import { I18n } from '@ngx-translate/i18n-polyfill'
 import { DropdownAction } from '../../../shared/buttons/action-dropdown.component'
 import { ConfirmService } from '../../../core/index'
@@ -53,7 +53,7 @@ export class VideoAbuseListComponent extends RestTable implements OnInit, AfterV
    private videoAbuseService: VideoAbuseService,
    private blocklistService: BlocklistService,
    private videoService: VideoService,
-    private videoBlacklistService: VideoBlacklistService,
+    private videoBlocklistService: VideoBlockService,
    private confirmService: ConfirmService,
    private i18n: I18n,
    private markdownRenderer: MarkdownService,
@@ -101,13 +101,13 @@ export class VideoAbuseListComponent extends RestTable implements OnInit, AfterV
          isDisplayed: videoAbuse => !videoAbuse.video.deleted
        },
        {
-          label: this.i18n('Blacklist video'),
+          label: this.i18n('Block video'),
          isDisplayed: videoAbuse => !videoAbuse.video.deleted && !videoAbuse.video.blacklisted,
          handler: videoAbuse => {
-            this.videoBlacklistService.blacklistVideo(videoAbuse.video.id, undefined, true)
+            this.videoBlocklistService.blockVideo(videoAbuse.video.id, undefined, true)
              .subscribe(
                () => {
-                  this.notifier.success(this.i18n('Video blacklisted.'))
+                  this.notifier.success(this.i18n('Video blocklisted.'))
                  this.updateVideoAbuseState(videoAbuse, VideoAbuseState.ACCEPTED)
                },
@@ -117,13 +117,13 @@ export class VideoAbuseListComponent extends RestTable implements OnInit, AfterV
          }
        },
        {
-          label: this.i18n('Unblacklist video'),
+          label: this.i18n('Unblock video'),
          isDisplayed: videoAbuse => !videoAbuse.video.deleted && videoAbuse.video.blacklisted,
          handler: videoAbuse => {
-            this.videoBlacklistService.removeVideoFromBlacklist(videoAbuse.video.id)
+            this.videoBlocklistService.unblockVideo(videoAbuse.video.id)
              .subscribe(
                () => {
-                  this.notifier.success(this.i18n('Video unblacklisted.'))
+                  this.notifier.success(this.i18n('Video unblocklisted.'))
                  this.updateVideoAbuseState(videoAbuse, VideoAbuseState.ACCEPTED)
                },
@@ -292,7 +292,6 @@ export class VideoAbuseListComponent extends RestTable implements OnInit, AfterV
        err => this.notifier.error(err.message)
      )
  }
  protected loadData () {
diff --git a/client/src/app/+admin/moderation/video-auto-blacklist-list/index.ts b/client/src/app/+admin/moderation/video-auto-blacklist-list/index.ts
deleted file mode 100644
index e3522f68c..000000000
--- a/client/src/app/+admin/moderation/video-auto-blacklist-list/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './video-auto-blacklist-list.component'
diff --git a/client/src/app/+admin/moderation/video-auto-blacklist-list/video-auto-blacklist-list.component.html b/client/src/app/+admin/moderation/video-auto-blacklist-list/video-auto-blacklist-list.component.html
deleted file mode 100644
index e2193b630..000000000
--- a/client/src/app/+admin/moderation/video-auto-blacklist-list/video-auto-blacklist-list.component.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<my-videos-selection
-  [pagination]="pagination"
-  [(selection)]="selection"
-  [(videosModel)]="videos"
-  [miniatureDisplayOptions]="miniatureDisplayOptions"
-  [titlePage]="titlePage"
-  [getVideosObservableFunction]="getVideosObservableFunction"
->
-  <ng-template ptTemplate="globalButtons">
-    <span class="action-button action-button-unblacklist-selection" (click)="removeSelectedVideosFromBlacklist()">
-      <my-global-icon iconName="tick"></my-global-icon>
-      <ng-container i18n>Unblacklist</ng-container>
-    </span>
-  </ng-template>
-  <ng-template ptTemplate="rowButtons" let-video>
-    <my-button i18n-label label="Unblacklist" icon="tick" (click)="removeVideoFromBlacklist(video)"></my-button>
-  </ng-template>
-</my-videos-selection>
diff --git a/client/src/app/+admin/moderation/video-auto-blacklist-list/video-auto-blacklist-list.component.scss b/client/src/app/+admin/moderation/video-auto-blacklist-list/video-auto-blacklist-list.component.scss
deleted file mode 100644
index 85ebc6041..000000000
--- a/client/src/app/+admin/moderation/video-auto-blacklist-list/video-auto-blacklist-list.component.scss
+++ /dev/null
@@ -1,14 +0,0 @@
-@import '_variables';
-@import '_mixins';
-.action-button-unblacklist-selection {
-  display: inline-block;
-  @include peertube-button;
-  @include orange-button;
-  @include button-with-icon(21px);
-  my-global-icon {
-    @include apply-svg-color(#fff);
-  }
-}
diff --git a/client/src/app/+admin/moderation/video-auto-blacklist-list/video-auto-blacklist-list.component.ts b/client/src/app/+admin/moderation/video-auto-blacklist-list/video-auto-blacklist-list.component.ts
deleted file mode 100644
index fb2962b47..000000000
--- a/client/src/app/+admin/moderation/video-auto-blacklist-list/video-auto-blacklist-list.component.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-import { Component } from '@angular/core'
-import { I18n } from '@ngx-translate/i18n-polyfill'
-import { ActivatedRoute, Router } from '@angular/router'
-import { ComponentPagination } from '@app/shared/rest/component-pagination.model'
-import { AuthService, Notifier, ServerService } from '@app/core'
-import { VideoBlacklistService } from '@app/shared'
-import { immutableAssign } from '@app/shared/misc/utils'
-import { ScreenService } from '@app/shared/misc/screen.service'
-import { MiniatureDisplayOptions } from '@app/shared/video/video-miniature.component'
-import { SelectionType } from '@app/shared/video/videos-selection.component'
-import { Video } from '@app/shared/video/video.model'
-@Component({
-  selector: 'my-video-auto-blacklist-list',
-  templateUrl: './video-auto-blacklist-list.component.html',
-  styleUrls: [ './video-auto-blacklist-list.component.scss' ]
-})
-export class VideoAutoBlacklistListComponent {
-  titlePage: string
-  selection: SelectionType = {}
-  miniatureDisplayOptions: MiniatureDisplayOptions = {
-    date: true,
-    views: false,
-    by: true,
-    privacyLabel: false,
-    privacyText: true,
-    state: false,
-    blacklistInfo: false,
-    nsfw: true
-  }
-  pagination: ComponentPagination = {
-    currentPage: 1,
-    itemsPerPage: 5,
-    totalItems: null
-  }
-  videos: Video[] = []
-  getVideosObservableFunction = this.getVideosObservable.bind(this)
-  constructor (
-    protected router: Router,
-    protected route: ActivatedRoute,
-    protected notifier: Notifier,
-    protected authService: AuthService,
-    protected screenService: ScreenService,
-    protected serverService: ServerService,
-    private i18n: I18n,
-    private videoBlacklistService: VideoBlacklistService
-  ) {
-    this.titlePage = this.i18n('Auto-blacklisted videos')
-  }
-  getVideosObservable (page: number) {
-    const newPagination = immutableAssign(this.pagination, { currentPage: page })
-    return this.videoBlacklistService.getAutoBlacklistedAsVideoList(newPagination)
-  }
-  removeVideoFromBlacklist (entry: Video) {
-    this.videoBlacklistService.removeVideoFromBlacklist(entry.id).subscribe(
-      () => {
-        this.notifier.success(this.i18n('Video {{name}} removed from blacklist.', { name: entry.name }))
-        this.videos = this.videos.filter(v => v.id !== entry.id)
-      },
-      error => this.notifier.error(error.message)
-    )
-  }
-  removeSelectedVideosFromBlacklist () {
-    const toReleaseVideosIds = Object.keys(this.selection)
-                                      .filter(k => this.selection[ k ] === true)
-                                      .map(k => parseInt(k, 10))
-    this.videoBlacklistService.removeVideoFromBlacklist(toReleaseVideosIds).subscribe(
-      () => {
-        this.notifier.success(this.i18n('{{num}} videos removed from blacklist.', { num: toReleaseVideosIds.length }))
-        this.selection = {}
-        this.videos = this.videos.filter(v => toReleaseVideosIds.includes(v.id) === false)
-      },
-      error => this.notifier.error(error.message)
-    )
-  }
-}
diff --git a/client/src/app/+admin/moderation/video-blacklist-list/index.ts b/client/src/app/+admin/moderation/video-blacklist-list/index.ts
deleted file mode 100644
index 4daf64187..000000000
--- a/client/src/app/+admin/moderation/video-blacklist-list/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './video-blacklist-list.component'
diff --git a/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html b/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html
deleted file mode 100644
index cfa04514f..000000000
--- a/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<p-table
-  [value]="blacklist" [lazy]="true" [paginator]="totalRecords > 0" [totalRecords]="totalRecords" [rows]="rowsPerPage" [rowsPerPageOptions]="rowsPerPageOptions"
-  [sortField]="sort.field" [sortOrder]="sort.order" (onLazyLoad)="loadLazy($event)" dataKey="id"
-  [showCurrentPageReport]="true" i18n-currentPageReportTemplate
-  currentPageReportTemplate="Showing {{'{first}'}} to {{'{last}'}} of {{'{totalRecords}'}} blacklisted videos"
-  (onPage)="onPage($event)" [expandedRowKeys]="expandedRows"
->
-  <ng-template pTemplate="caption">
-    <div class="caption">
-      <div class="ml-auto has-feedback has-clear">
-        <input
-          type="text" name="table-filter" id="table-filter" i18n-placeholder placeholder="Filter..."
-          (keyup)="onSearch($event)"
-        >
-        <a class="glyphicon glyphicon-remove-sign form-control-feedback form-control-clear" (click)="resetSearch()"></a>
-        <span class="sr-only" i18n>Clear filters</span>
-      </div>
-    </div>
-  </ng-template>
-  <ng-template pTemplate="header">
-    <tr>
-      <th style="width: 40px"></th>
-      <th i18n pSortableColumn="name">Video <p-sortIcon field="name"></p-sortIcon></th>
-      <th style="width: 100px;" i18n>Sensitive</th>
-      <th style="width: 120px;" i18n>Unfederated</th>
-      <th style="width: 150px;" i18n pSortableColumn="createdAt">Date <p-sortIcon field="createdAt"></p-sortIcon></th>
-      <th style="width: 150px;"></th>
-    </tr>
-  </ng-template>
-  <ng-template pTemplate="body" let-videoBlacklist let-expanded="expanded">
-    <tr>
-      <td *ngIf="!videoBlacklist.reason"></td>
-      <td *ngIf="videoBlacklist.reason" class="expand-cell c-hand" [pRowToggler]="videoBlacklist" i18n-ngbTooltip ngbTooltip="More information" placement="top-left" container="body">
-        <span class="expander">
-          <i [ngClass]="expanded ? 'glyphicon glyphicon-menu-down' : 'glyphicon glyphicon-menu-right'"></i>
-        </span>
-      </td>
-      <td>
-        <a [href]="getVideoUrl(videoBlacklist)" class="video-table-video-link" i18n-title title="Open video in a new tab" target="_blank" rel="noopener noreferrer">
-          <div class="video-table-video">
-            <div class="video-table-video-image">
-              <img [src]="videoBlacklist.video.thumbnailPath">
-            </div>
-            <div class="video-table-video-text">
-              <div>
-                {{ videoBlacklist.video.name }}
-                <span i18n-title title="Video was blacklisted" class="glyphicon glyphicon-ban-circle"></span>
-              </div>
-              <div class="text-muted">by {{ videoBlacklist.video.channel?.displayName }} on {{ videoBlacklist.video.channel?.host }} </div>
-            </div>
-          </div>
-        </a>
-      </td>
-      <ng-container *ngIf="videoBlacklist.reason">
-        <td class="c-hand" [pRowToggler]="videoBlacklist">{{ booleanToText(videoBlacklist.video.nsfw) }}</td>
-        <td class="c-hand" [pRowToggler]="videoBlacklist">{{ booleanToText(videoBlacklist.unfederated) }}</td>
-        <td class="c-hand" [pRowToggler]="videoBlacklist">{{ videoBlacklist.createdAt | date: 'short' }}</td>
-      </ng-container>
-      <ng-container *ngIf="!videoBlacklist.reason">
-        <td>{{ booleanToText(videoBlacklist.video.nsfw) }}</td>
-        <td>{{ booleanToText(videoBlacklist.unfederated) }}</td>
-        <td>{{ videoBlacklist.createdAt | date: 'short' }}</td>
-      </ng-container>
-      <td class="action-cell">
-        <my-action-dropdown
-          [ngClass]="{ 'show': expanded }" placement="bottom-right" container="body"
-          i18n-label label="Actions" [actions]="videoBlacklistActions" [entry]="videoBlacklist"
-        ></my-action-dropdown>
-      </td>
-    </tr>
-  </ng-template>
-  <ng-template pTemplate="rowexpansion" let-videoBlacklist>
-    <tr>
-      <td class="expand-cell" colspan="6">
-        <div class="d-flex moderation-expanded">
-          <span class="col-2 moderation-expanded-label" i18n>Blacklist reason:</span>
-          <span class="col-9 moderation-expanded-text" [innerHTML]="videoBlacklist.reasonHtml"></span>
-        </div>
-      </td>
-    </tr>
-  </ng-template>
-  <ng-template pTemplate="emptymessage">
-    <tr>
-      <td colspan="6">
-        <div class="empty-table-message">
-          <ng-container *ngIf="search" i18n>No blacklisted video found matching current filters.</ng-container>
-          <ng-container *ngIf="!search" i18n>No blacklisted video found.</ng-container>
-        </div>
-      </td>
-    </tr>
-  </ng-template>
-</p-table>
diff --git a/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts b/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts
deleted file mode 100644
index 63ecdeb9f..000000000
--- a/client/src/app/+admin/moderation/video-blacklist-list/video-blacklist-list.component.ts
+++ /dev/null
@@ -1,113 +0,0 @@
-import { Component, OnInit } from '@angular/core'
-import { SortMeta } from 'primeng/api'
-import { Notifier, ServerService } from '@app/core'
-import { ConfirmService } from '../../../core'
-import { RestPagination, RestTable, VideoBlacklistService } from '../../../shared'
-import { VideoBlacklist, VideoBlacklistType } from '../../../../../../shared'
-import { I18n } from '@ngx-translate/i18n-polyfill'
-import { DropdownAction } from '../../../shared/buttons/action-dropdown.component'
-import { Video } from '../../../shared/video/video.model'
-import { MarkdownService } from '@app/shared/renderer'
-@Component({
-  selector: 'my-video-blacklist-list',
-  templateUrl: './video-blacklist-list.component.html',
-  styleUrls: [ '../moderation.component.scss' ]
-})
-export class VideoBlacklistListComponent extends RestTable implements OnInit {
-  blacklist: (VideoBlacklist & { reasonHtml?: string })[] = []
-  totalRecords = 0
-  sort: SortMeta = { field: 'createdAt', order: -1 }
-  pagination: RestPagination = { count: this.rowsPerPage, start: 0 }
-  listBlacklistTypeFilter: VideoBlacklistType = undefined
-  videoBlacklistActions: DropdownAction<VideoBlacklist>[] = []
-  constructor (
-    private notifier: Notifier,
-    private serverService: ServerService,
-    private confirmService: ConfirmService,
-    private videoBlacklistService: VideoBlacklistService,
-    private markdownRenderer: MarkdownService,
-    private i18n: I18n
-  ) {
-    super()
-  }
-  ngOnInit () {
-    this.serverService.getConfig()
-        .subscribe(config => {
-          // don't filter if auto-blacklist is not enabled as this will be the only list
-          if (config.autoBlacklist.videos.ofUsers.enabled) {
-            this.listBlacklistTypeFilter = VideoBlacklistType.MANUAL
-          }
-        })
-    this.initialize()
-    this.videoBlacklistActions = [
-      {
-        label: this.i18n('Unblacklist'),
-        handler: videoBlacklist => this.removeVideoFromBlacklist(videoBlacklist)
-      }
-    ]
-  }
-  getIdentifier () {
-    return 'VideoBlacklistListComponent'
-  }
-  getVideoUrl (videoBlacklist: VideoBlacklist) {
-    return Video.buildClientUrl(videoBlacklist.video.uuid)
-  }
-  booleanToText (value: boolean) {
-    if (value === true) return this.i18n('yes')
-    return this.i18n('no')
-  }
-  toHtml (text: string) {
-    return this.markdownRenderer.textMarkdownToHTML(text)
-  }
-  async removeVideoFromBlacklist (entry: VideoBlacklist) {
-    const confirmMessage = this.i18n(
-      'Do you really want to remove this video from the blacklist? It will be available again in the videos list.'
-    )
-    const res = await this.confirmService.confirm(confirmMessage, this.i18n('Unblacklist'))
-    if (res === false) return
-    this.videoBlacklistService.removeVideoFromBlacklist(entry.video.id).subscribe(
-      () => {
-        this.notifier.success(this.i18n('Video {{name}} removed from the blacklist.', { name: entry.video.name }))
-        this.loadData()
-      },
-      err => this.notifier.error(err.message)
-    )
-  }
-  protected loadData () {
-    this.videoBlacklistService.listBlacklist({
-      pagination: this.pagination,
-      sort: this.sort,
-      search: this.search,
-      type: this.listBlacklistTypeFilter
-    })
-      .subscribe(
-        async resultList => {
-          this.totalRecords = resultList.total
-          this.blacklist = resultList.data
-          for (const element of this.blacklist) {
-            Object.assign(element, { reasonHtml: await this.toHtml(element.reason) })
-          }
-        },
-        err => this.notifier.error(err.message)
-      )
-  }
-}
diff --git a/client/src/app/+admin/moderation/video-block-list/index.ts b/client/src/app/+admin/moderation/video-block-list/index.ts
new file mode 100644
index 000000000..ec4de8f62
--- /dev/null
+++ b/client/src/app/+admin/moderation/video-block-list/index.ts
@@ -0,0 +1 @@
+export * from './video-block-list.component'
diff --git a/client/src/app/+admin/moderation/video-block-list/video-block-list.component.html b/client/src/app/+admin/moderation/video-block-list/video-block-list.component.html
new file mode 100644
index 000000000..f3ec37314
--- /dev/null
+++ b/client/src/app/+admin/moderation/video-block-list/video-block-list.component.html
@@ -0,0 +1,113 @@
+<p-table
+  [value]="blocklist" [lazy]="true" [paginator]="totalRecords > 0" [totalRecords]="totalRecords" [rows]="rowsPerPage" [rowsPerPageOptions]="rowsPerPageOptions"
+  [sortField]="sort.field" [sortOrder]="sort.order" (onLazyLoad)="loadLazy($event)" dataKey="id"
+  [showCurrentPageReport]="true" i18n-currentPageReportTemplate
+  currentPageReportTemplate="Showing {{'{first}'}} to {{'{last}'}} of {{'{totalRecords}'}} blocked videos"
+  (onPage)="onPage($event)" [expandedRowKeys]="expandedRows"
+>
+  <ng-template pTemplate="caption">
+    <div class="caption">
+      <div class="ml-auto">
+        <div class="input-group has-feedback has-clear">
+          <div class="input-group-prepend c-hand" ngbDropdown placement="bottom-left auto" container="body">
+            <div class="input-group-text" ngbDropdownToggle>
+              <span class="caret" aria-haspopup="menu" role="button"></span>
+            </div>
+            <div role="menu" ngbDropdownMenu>
+              <h6 class="dropdown-header" i18n>Advanced block filters</h6>
+              <a [routerLink]="[ '/admin/moderation/video-blocks/list' ]" [queryParams]="{ 'search': 'type:auto' }" class="dropdown-item" i18n>Automatic blocks</a>
+              <a [routerLink]="[ '/admin/moderation/video-blocks/list' ]" [queryParams]="{ 'search': 'type:manual' }" class="dropdown-item" i18n>Manual blocks</a>
+            </div>
+          </div>
+          <input
+            type="text" name="table-filter" id="table-filter" i18n-placeholder placeholder="Filter..."
+            (keyup)="onBlockSearch($event)"
+          >
+          <a class="glyphicon glyphicon-remove-sign form-control-feedback form-control-clear" (click)="resetTableFilter()"></a>
+          <span class="sr-only" i18n>Clear filters</span>
+        </div>
+      </div>
+    </div>
+  </ng-template>
+  <ng-template pTemplate="header">
+    <tr>
+      <th style="width: 40px"></th>
+      <th i18n pSortableColumn="name">Video <p-sortIcon field="name"></p-sortIcon></th>
+      <th style="width: 100px;" i18n>Sensitive</th>
+      <th style="width: 120px;" i18n>Unfederated</th>
+      <th style="width: 150px;" i18n pSortableColumn="createdAt">Date <p-sortIcon field="createdAt"></p-sortIcon></th>
+      <th style="width: 150px;"></th>
+    </tr>
+  </ng-template>
+  <ng-template pTemplate="body" let-videoBlock let-expanded="expanded">
+    <tr>
+      <td *ngIf="!videoBlock.reason"></td>
+      <td *ngIf="videoBlock.reason" class="expand-cell c-hand" [pRowToggler]="videoBlock" i18n-ngbTooltip ngbTooltip="More information" placement="top-left" container="body">
+        <span class="expander">
+          <i [ngClass]="expanded ? 'glyphicon glyphicon-menu-down' : 'glyphicon glyphicon-menu-right'"></i>
+        </span>
+      </td>
+      <td>
+        <a [href]="getVideoUrl(videoBlock)" class="video-table-video-link" i18n-title title="Open video in a new tab" target="_blank" rel="noopener noreferrer">
+          <div class="video-table-video">
+            <div class="video-table-video-image">
+              <img [src]="videoBlock.video.thumbnailPath">
+            </div>
+            <div class="video-table-video-text">
+              <div>
+                <my-global-icon i18n-title title="The video was blocked due to automatic blocking of new videos" *ngIf="videoBlock.type == 2" iconName="robot"></my-global-icon>
+                {{ videoBlock.video.name }}
+              </div>
+              <div class="text-muted">by {{ videoBlock.video.channel?.displayName }} on {{ videoBlock.video.channel?.host }} </div>
+            </div>
+          </div>
+        </a>
+      </td>
+      <ng-container *ngIf="videoBlock.reason">
+        <td class="c-hand" [pRowToggler]="videoBlock">{{ booleanToText(videoBlock.video.nsfw) }}</td>
+        <td class="c-hand" [pRowToggler]="videoBlock">{{ booleanToText(videoBlock.unfederated) }}</td>
+        <td class="c-hand" [pRowToggler]="videoBlock">{{ videoBlock.createdAt | date: 'short' }}</td>
+      </ng-container>
+      <ng-container *ngIf="!videoBlock.reason">
+        <td>{{ booleanToText(videoBlock.video.nsfw) }}</td>
+        <td>{{ booleanToText(videoBlock.unfederated) }}</td>
+        <td>{{ videoBlock.createdAt | date: 'short' }}</td>
+      </ng-container>
+      <td class="action-cell">
+        <my-action-dropdown
+          [ngClass]="{ 'show': expanded }" placement="bottom-right" container="body"
+          i18n-label label="Actions" [actions]="videoBlocklistActions" [entry]="videoBlock"
+        ></my-action-dropdown>
+      </td>
+    </tr>
+  </ng-template>
+  <ng-template pTemplate="rowexpansion" let-videoBlock>
+    <tr>
+      <td class="expand-cell" colspan="6">
+        <div class="d-flex moderation-expanded">
+          <span class="col-2 moderation-expanded-label" i18n>Block reason:</span>
+          <span class="col-9 moderation-expanded-text" [innerHTML]="videoBlock.reasonHtml"></span>
+        </div>
+      </td>
+    </tr>
+  </ng-template>
+  <ng-template pTemplate="emptymessage">
+    <tr>
+      <td colspan="6">
+        <div class="empty-table-message">
+          <ng-container *ngIf="search" i18n>No blocked video found matching current filters.</ng-container>
+          <ng-container *ngIf="!search" i18n>No blocked video found.</ng-container>
+        </div>
+      </td>
+    </tr>
+  </ng-template>
+</p-table>
diff --git a/client/src/app/+admin/moderation/video-block-list/video-block-list.component.scss b/client/src/app/+admin/moderation/video-block-list/video-block-list.component.scss
new file mode 100644
index 000000000..43a365608
--- /dev/null
+++ b/client/src/app/+admin/moderation/video-block-list/video-block-list.component.scss
@@ -0,0 +1,18 @@
+@import 'mixins';
+my-global-icon {
+  @include apply-svg-color(#7d7d7d);
+  width: 12px;
+  height: 12px;
+  position: relative;
+  top: -1px;
+}
+.input-group {
+  @include peertube-input-group(300px);
+  .dropdown-toggle::after {
+    margin-left: 0;
+  }
+}
diff --git a/client/src/app/+admin/moderation/video-block-list/video-block-list.component.ts b/client/src/app/+admin/moderation/video-block-list/video-block-list.component.ts
new file mode 100644
index 000000000..e72ab5348
--- /dev/null
+++ b/client/src/app/+admin/moderation/video-block-list/video-block-list.component.ts
@@ -0,0 +1,196 @@
+import { Component, OnInit } from '@angular/core'
+import { SortMeta } from 'primeng/api'
+import { Notifier, ServerService } from '@app/core'
+import { ConfirmService } from '../../../core'
+import { RestPagination, RestTable, VideoBlockService } from '../../../shared'
+import { VideoBlocklist, VideoBlockType } from '../../../../../../shared'
+import { I18n } from '@ngx-translate/i18n-polyfill'
+import { DropdownAction } from '../../../shared/buttons/action-dropdown.component'
+import { Video } from '../../../shared/video/video.model'
+import { MarkdownService } from '@app/shared/renderer'
+import { Params, ActivatedRoute, Router } from '@angular/router'
+import { filter, switchMap } from 'rxjs/operators'
+import { VideoService } from '@app/shared/video/video.service'
+@Component({
+  selector: 'my-video-block-list',
+  templateUrl: './video-block-list.component.html',
+  styleUrls: [ '../moderation.component.scss', './video-block-list.component.scss' ]
+})
+export class VideoBlockListComponent extends RestTable implements OnInit {
+  blocklist: (VideoBlocklist & { reasonHtml?: string })[] = []
+  totalRecords = 0
+  sort: SortMeta = { field: 'createdAt', order: -1 }
+  pagination: RestPagination = { count: this.rowsPerPage, start: 0 }
+  listBlockTypeFilter: VideoBlockType = undefined
+  videoBlocklistActions: DropdownAction<VideoBlocklist>[][] = []
+  constructor (
+    private notifier: Notifier,
+    private serverService: ServerService,
+    private confirmService: ConfirmService,
+    private videoBlocklistService: VideoBlockService,
+    private markdownRenderer: MarkdownService,
+    private videoService: VideoService,
+    private route: ActivatedRoute,
+    private router: Router,
+    private i18n: I18n
+  ) {
+    super()
+    this.videoBlocklistActions = [
+      [
+        {
+          label: this.i18n('Internal actions'),
+          isHeader: true
+        },
+        {
+          label: this.i18n('Switch video block to manual'),
+          handler: videoBlock => {
+            this.videoBlocklistService.unblockVideo(videoBlock.video.id).pipe(
+              switchMap(_ => this.videoBlocklistService.blockVideo(videoBlock.video.id, undefined, true))
+            ).subscribe(
+              () => {
+                this.notifier.success(this.i18n('Video {{name}} switched to manual block.', { name: videoBlock.video.name }))
+                this.loadData()
+              },
+        
+              err => this.notifier.error(err.message)
+            )
+          }
+        }
+      ],
+      [
+        {
+          label: this.i18n('Actions for the video'),
+          isHeader: true,
+        },
+        {
+          label: this.i18n('Unblock video'),
+          handler: videoBlock => this.unblockVideo(videoBlock)
+        },
+        {
+          label: this.i18n('Delete video'),
+          handler: async videoBlock => {
+            const res = await this.confirmService.confirm(
+              this.i18n('Do you really want to delete this video?'),
+              this.i18n('Delete')
+            )
+            if (res === false) return
+            this.videoService.removeVideo(videoBlock.video.id)
+              .subscribe(
+                () => {
+                  this.notifier.success(this.i18n('Video deleted.'))
+                },
+                err => this.notifier.error(err.message)
+              )
+          }
+        }
+      ]
+    ]
+  }
+  ngOnInit () {
+    this.serverService.getConfig()
+        .subscribe(config => {
+          // don't filter if auto-blacklist is not enabled as this will be the only list
+          if (config.autoBlacklist.videos.ofUsers.enabled) {
+            this.listBlockTypeFilter = VideoBlockType.MANUAL
+          }
+        })
+    this.initialize()
+    this.route.queryParams
+      .pipe(filter(params => params.search !== undefined && params.search !== null))
+      .subscribe(params => {
+        this.search = params.search
+        this.setTableFilter(params.search)
+        this.loadData()
+      })
+  }
+  ngAfterViewInit () {
+    if (this.search) this.setTableFilter(this.search)
+  }
+  /* Table filter functions */
+  onBlockSearch (event: Event) {
+    this.onSearch(event)
+    this.setQueryParams((event.target as HTMLInputElement).value)
+  }
+  setQueryParams (search: string) {
+    const queryParams: Params = {}
+    if (search) Object.assign(queryParams, { search })
+    this.router.navigate([ '/admin/moderation/video-blocks/list' ], { queryParams })
+  }
+  resetTableFilter () {
+    this.setTableFilter('')
+    this.setQueryParams('')
+    this.resetSearch()
+  }
+  /* END Table filter functions */
+  getIdentifier () {
+    return 'VideoBlockListComponent'
+  }
+  getVideoUrl (videoBlock: VideoBlocklist) {
+    return Video.buildClientUrl(videoBlock.video.uuid)
+  }
+  booleanToText (value: boolean) {
+    if (value === true) return this.i18n('yes')
+    return this.i18n('no')
+  }
+  toHtml (text: string) {
+    return this.markdownRenderer.textMarkdownToHTML(text)
+  }
+  async unblockVideo (entry: VideoBlocklist) {
+    const confirmMessage = this.i18n(
+      'Do you really want to unblock this video? It will be available again in the videos list.'
+    )
+    const res = await this.confirmService.confirm(confirmMessage, this.i18n('Unblock'))
+    if (res === false) return
+    this.videoBlocklistService.unblockVideo(entry.video.id).subscribe(
+      () => {
+        this.notifier.success(this.i18n('Video {{name}} unblocked.', { name: entry.video.name }))
+        this.loadData()
+      },
+      err => this.notifier.error(err.message)
+    )
+  }
+  protected loadData () {
+    this.videoBlocklistService.listBlocks({
+      pagination: this.pagination,
+      sort: this.sort,
+      search: this.search,
+    })
+      .subscribe(
+        async resultList => {
+          this.totalRecords = resultList.total
+          this.blocklist = resultList.data
+          for (const element of this.blocklist) {
+            Object.assign(element, { reasonHtml: await this.toHtml(element.reason) })
+          }
+        },
+        err => this.notifier.error(err.message)
+      )
+  }
+}
diff --git a/client/src/app/+admin/users/user-edit/user-edit.ts b/client/src/app/+admin/users/user-edit/user-edit.ts
index 6e2952c44..98249bcc1 100644
--- a/client/src/app/+admin/users/user-edit/user-edit.ts
+++ b/client/src/app/+admin/users/user-edit/user-edit.ts
@@ -88,7 +88,7 @@ export abstract class UserEdit extends FormReactive implements OnInit {
  }
  protected buildAdminFlags (formValue: any) {
-    return formValue.byPassAutoBlacklist ? UserAdminFlag.BY_PASS_VIDEO_AUTO_BLACKLIST : UserAdminFlag.NONE
+    return formValue.byPassAutoBlacklist ? UserAdminFlag.BYPASS_VIDEO_AUTO_BLOCK : UserAdminFlag.NONE
  }
  protected buildQuotaOptions () {
diff --git a/client/src/app/+admin/users/user-edit/user-update.component.ts b/client/src/app/+admin/users/user-edit/user-update.component.ts
index e0e1fbddf..f2bd8c8ec 100644
--- a/client/src/app/+admin/users/user-edit/user-update.component.ts
+++ b/client/src/app/+admin/users/user-edit/user-update.component.ts
@@ -125,7 +125,7 @@ export class UserUpdateComponent extends UserEdit implements OnInit, OnDestroy {
      role: userJson.role.toString(),
      videoQuota: userJson.videoQuota,
      videoQuotaDaily: userJson.videoQuotaDaily,
-      byPassAutoBlacklist: userJson.adminFlags & UserAdminFlag.BY_PASS_VIDEO_AUTO_BLACKLIST
+      byPassAutoBlacklist: userJson.adminFlags & UserAdminFlag.BYPASS_VIDEO_AUTO_BLOCK
    })
  }
 }
diff --git a/client/src/app/+my-account/my-account-history/my-account-history.component.html b/client/src/app/+my-account/my-account-history/my-account-history.component.html
index d3a329e8f..817b929fe 100644
--- a/client/src/app/+my-account/my-account-history/my-account-history.component.html
+++ b/client/src/app/+my-account/my-account-history/my-account-history.component.html
@@ -17,6 +17,6 @@
  <div class="video" *ngFor="let video of videos">
    <my-video-miniature
      [video]="video" [displayAsRow]="true"
-      (videoRemoved)="removeVideoFromArray(video)" (videoBlacklisted)="removeVideoFromArray(video)"></my-video-miniature>
+      (videoRemoved)="removeVideoFromArray(video)" (videoBlocked)="removeVideoFromArray(video)"></my-video-miniature>
  </div>
 </div>
diff --git a/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts b/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts
index 6ba1a1020..72e26ac28 100644
--- a/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts
+++ b/client/src/app/+my-account/my-account-settings/my-account-notification-preferences/my-account-notification-preferences.component.ts
@@ -35,8 +35,8 @@ export class MyAccountNotificationPreferencesComponent implements OnInit {
      newVideoFromSubscription: this.i18n('New video from your subscriptions'),
      newCommentOnMyVideo: this.i18n('New comment on your video'),
      videoAbuseAsModerator: this.i18n('New video abuse'),
-      videoAutoBlacklistAsModerator: this.i18n('Video auto-blacklisted waiting review'),
+      videoAutoBlacklistAsModerator: this.i18n('Video blocked automatically waiting review'),
-      blacklistOnMyVideo: this.i18n('One of your video is blacklisted/unblacklisted'),
+      blacklistOnMyVideo: this.i18n('One of your video is blocked/unblocked'),
      myVideoPublished: this.i18n('Video published (after transcoding/scheduled update)'),
      myVideoImportFinished: this.i18n('Video import finished'),
      newUserRegistration: this.i18n('A new user registered on your instance'),
@@ -49,7 +49,7 @@ export class MyAccountNotificationPreferencesComponent implements OnInit {
    this.rightNotifications = {
      videoAbuseAsModerator: UserRight.MANAGE_VIDEO_ABUSES,
-      videoAutoBlacklistAsModerator: UserRight.MANAGE_VIDEO_BLACKLIST,
+      videoAutoBlacklistAsModerator: UserRight.MANAGE_VIDEO_BLOCKS,
      newUserRegistration: UserRight.MANAGE_USERS,
      newInstanceFollower: UserRight.MANAGE_SERVER_FOLLOW,
      autoInstanceFollowing: UserRight.MANAGE_CONFIGURATION
diff --git a/client/src/app/menu/menu.component.ts b/client/src/app/menu/menu.component.ts
index 015c14bce..79bf29e9c 100644
--- a/client/src/app/menu/menu.component.ts
+++ b/client/src/app/menu/menu.component.ts
@@ -33,7 +33,7 @@ export class MenuComponent implements OnInit {
    [UserRight.MANAGE_USERS]: '/admin/users',
    [UserRight.MANAGE_SERVER_FOLLOW]: '/admin/friends',
    [UserRight.MANAGE_VIDEO_ABUSES]: '/admin/moderation/video-abuses',
-    [UserRight.MANAGE_VIDEO_BLACKLIST]: '/admin/moderation/video-blacklist',
+    [UserRight.MANAGE_VIDEO_BLOCKS]: '/admin/moderation/video-blocks',
    [UserRight.MANAGE_JOBS]: '/admin/jobs',
    [UserRight.MANAGE_CONFIGURATION]: '/admin/config'
  }
@@ -131,7 +131,7 @@ export class MenuComponent implements OnInit {
      UserRight.MANAGE_USERS,
      UserRight.MANAGE_SERVER_FOLLOW,
      UserRight.MANAGE_VIDEO_ABUSES,
-      UserRight.MANAGE_VIDEO_BLACKLIST,
+      UserRight.MANAGE_VIDEO_BLOCKS,
      UserRight.MANAGE_JOBS,
      UserRight.MANAGE_CONFIGURATION
    ]
diff --git a/client/src/app/search/search.component.html b/client/src/app/search/search.component.html
index 3cafc676d..d723606db 100644
--- a/client/src/app/search/search.component.html
+++ b/client/src/app/search/search.component.html
@@ -55,7 +55,7 @@
      <my-video-miniature
        [video]="result" [user]="user" [displayAsRow]="true" [displayVideoActions]="!hideActions()"
        [useLazyLoadUrl]="advancedSearch.searchTarget === 'search-index'"
-        (videoBlacklisted)="removeVideoFromArray(result)" (videoRemoved)="removeVideoFromArray(result)"
+        (videoBlocked)="removeVideoFromArray(result)" (videoRemoved)="removeVideoFromArray(result)"
      ></my-video-miniature>
    </div>
  </ng-container>
diff --git a/client/src/app/shared/forms/form-validators/index.ts b/client/src/app/shared/forms/form-validators/index.ts
index e3de3ae13..4a01b1622 100644
--- a/client/src/app/shared/forms/form-validators/index.ts
+++ b/client/src/app/shared/forms/form-validators/index.ts
@@ -6,7 +6,7 @@ export * from './login-validators.service'
 export * from './reset-password-validators.service'
 export * from './user-validators.service'
 export * from './video-abuse-validators.service'
-export * from './video-blacklist-validators.service'
+export * from './video-block-validators.service'
 export * from './video-channel-validators.service'
 export * from './video-comment-validators.service'
 export * from './video-validators.service'
diff --git a/client/src/app/shared/forms/form-validators/video-blacklist-validators.service.ts b/client/src/app/shared/forms/form-validators/video-block-validators.service.ts
index 07d1f264a..dc8257761 100644
--- a/client/src/app/shared/forms/form-validators/video-blacklist-validators.service.ts
+++ b/client/src/app/shared/forms/form-validators/video-block-validators.service.ts
@@ -4,15 +4,15 @@ import { Injectable } from '@angular/core'
 import { BuildFormValidator } from '@app/shared'
 @Injectable()
-export class VideoBlacklistValidatorsService {
+export class VideoBlockValidatorsService {
-  readonly VIDEO_BLACKLIST_REASON: BuildFormValidator
+  readonly VIDEO_BLOCK_REASON: BuildFormValidator
  constructor (private i18n: I18n) {
-    this.VIDEO_BLACKLIST_REASON = {
+    this.VIDEO_BLOCK_REASON = {
      VALIDATORS: [ Validators.minLength(2), Validators.maxLength(300) ],
      MESSAGES: {
-        'minlength': this.i18n('Blacklist reason must be at least 2 characters long.'),
+        'minlength': this.i18n('Block reason must be at least 2 characters long.'),
-        'maxlength': this.i18n('Blacklist reason cannot be more than 300 characters long.')
+        'maxlength': this.i18n('Block reason cannot be more than 300 characters long.')
      }
    }
  }
diff --git a/client/src/app/shared/images/global-icon.component.ts b/client/src/app/shared/images/global-icon.component.ts
index d2700f6c3..169882685 100644
--- a/client/src/app/shared/images/global-icon.component.ts
+++ b/client/src/app/shared/images/global-icon.component.ts
@@ -56,7 +56,8 @@ const icons = {
  'refresh': require('!!raw-loader?!../../../assets/images/global/refresh.svg').default,
  'npm': require('!!raw-loader?!../../../assets/images/global/npm.svg').default,
  'fullscreen': require('!!raw-loader?!../../../assets/images/global/fullscreen.svg').default,
-  'exit-fullscreen': require('!!raw-loader?!../../../assets/images/global/exit-fullscreen.svg').default
+  'exit-fullscreen': require('!!raw-loader?!../../../assets/images/global/exit-fullscreen.svg').default,
+  'robot': require('!!raw-loader?!../../../assets/images/global/robot.svg').default
 }
 export type GlobalIconName = keyof typeof icons
diff --git a/client/src/app/shared/index.ts b/client/src/app/shared/index.ts
index 136730c91..8be578d9f 100644
--- a/client/src/app/shared/index.ts
+++ b/client/src/app/shared/index.ts
@@ -3,5 +3,5 @@ export * from './forms'
 export * from './rest'
 export * from './users'
 export * from './video-abuse'
-export * from './video-blacklist'
+export * from './video-block'
 export * from './shared.module'
diff --git a/client/src/app/shared/shared.module.ts b/client/src/app/shared/shared.module.ts
index 813f76672..2035097d7 100644
--- a/client/src/app/shared/shared.module.ts
+++ b/client/src/app/shared/shared.module.ts
@@ -35,7 +35,7 @@ import {
  UserValidatorsService,
  VideoAbuseValidatorsService,
  VideoAcceptOwnershipValidatorsService,
-  VideoBlacklistValidatorsService,
+  VideoBlockValidatorsService,
  VideoChangeOwnershipValidatorsService,
  VideoChannelValidatorsService,
  VideoCommentValidatorsService,
@@ -78,7 +78,7 @@ import { VideoPlaylistElementMiniatureComponent } from '@app/shared/video-playli
 import { VideoPlaylistMiniatureComponent } from '@app/shared/video-playlist/video-playlist-miniature.component'
 import { VideoPlaylistService } from '@app/shared/video-playlist/video-playlist.service'
 import { InfiniteScrollerDirective } from '@app/shared/video/infinite-scroller.directive'
-import { VideoBlacklistComponent } from '@app/shared/video/modals/video-blacklist.component'
+import { VideoBlockComponent } from '@app/shared/video/modals/video-block.component'
 import { VideoDownloadComponent } from '@app/shared/video/modals/video-download.component'
 import { VideoReportComponent } from '@app/shared/video/modals/video-report.component'
 import { RedundancyService } from '@app/shared/video/redundancy.service'
@@ -102,7 +102,7 @@ import { LoaderComponent } from './misc/loader.component'
 import { RestExtractor, RestService } from './rest'
 import { UserService } from './users'
 import { VideoAbuseService } from './video-abuse'
-import { VideoBlacklistService } from './video-blacklist'
+import { VideoBlockService } from './video-block'
 import { VideoOwnershipService } from './video-ownership'
 import { FeedComponent } from './video/feed.component'
 import { VideoMiniatureComponent } from './video/video-miniature.component'
@@ -147,7 +147,7 @@ import { VideoService } from './video/video.service'
    VideoDownloadComponent,
    VideoReportComponent,
-    VideoBlacklistComponent,
+    VideoBlockComponent,
    FeedComponent,
@@ -230,7 +230,7 @@ import { VideoService } from './video/video.service'
    VideoDownloadComponent,
    VideoReportComponent,
-    VideoBlacklistComponent,
+    VideoBlockComponent,
    FeedComponent,
@@ -282,7 +282,7 @@ import { VideoService } from './video/video.service'
    RestExtractor,
    RestService,
    VideoAbuseService,
-    VideoBlacklistService,
+    VideoBlockService,
    VideoOwnershipService,
    UserService,
    VideoService,
@@ -305,7 +305,7 @@ import { VideoService } from './video/video.service'
    VideoCommentValidatorsService,
    VideoValidatorsService,
    VideoCaptionsValidatorsService,
-    VideoBlacklistValidatorsService,
+    VideoBlockValidatorsService,
    OverviewService,
    VideoChangeOwnershipValidatorsService,
    VideoAcceptOwnershipValidatorsService,
diff --git a/client/src/app/shared/users/user-notification.model.ts b/client/src/app/shared/users/user-notification.model.ts
index 7b8368d87..bc1861c64 100644
--- a/client/src/app/shared/users/user-notification.model.ts
+++ b/client/src/app/shared/users/user-notification.model.ts
@@ -96,7 +96,7 @@ export class UserNotification implements UserNotificationServer {
          this.videoUrl = this.buildVideoUrl(this.video)
          break
-        case UserNotificationType.UNBLACKLIST_ON_MY_VIDEO:
+        case UserNotificationType.UNBLOCK_ON_MY_VIDEO:
          this.videoUrl = this.buildVideoUrl(this.video)
          break
@@ -112,7 +112,7 @@ export class UserNotification implements UserNotificationServer {
          this.videoUrl = this.buildVideoUrl(this.videoAbuse.video)
          break
-        case UserNotificationType.VIDEO_AUTO_BLACKLIST_FOR_MODERATORS:
+        case UserNotificationType.VIDEO_AUTO_BLOCK_FOR_MODERATORS:
          this.videoAutoBlacklistUrl = '/admin/moderation/video-auto-blacklist/list'
          // Backward compatibility where we did not assign videoBlacklist to this type of notification before
          if (!this.videoBlacklist) this.videoBlacklist = { id: null, video: this.video }
@@ -120,7 +120,7 @@ export class UserNotification implements UserNotificationServer {
          this.videoUrl = this.buildVideoUrl(this.videoBlacklist.video)
          break
-        case UserNotificationType.BLACKLIST_ON_MY_VIDEO:
+        case UserNotificationType.BLOCK_ON_MY_VIDEO:
          this.videoUrl = this.buildVideoUrl(this.videoBlacklist.video)
          break
diff --git a/client/src/app/shared/users/user-notifications.component.html b/client/src/app/shared/users/user-notifications.component.html
index 8dbe6e329..5a102995a 100644
--- a/client/src/app/shared/users/user-notifications.component.html
+++ b/client/src/app/shared/users/user-notifications.component.html
@@ -26,19 +26,19 @@
        </ng-template>
      </ng-container>
-      <ng-container *ngSwitchCase="UserNotificationType.UNBLACKLIST_ON_MY_VIDEO">
+      <ng-container *ngSwitchCase="UserNotificationType.UNBLOCK_ON_MY_VIDEO">
        <my-global-icon iconName="undo"></my-global-icon>
        <div class="message" i18n>
-          Your video <a (click)="markAsRead(notification)" [routerLink]="notification.videoUrl">{{ notification.video.name }}</a> has been unblacklisted
+          Your video <a (click)="markAsRead(notification)" [routerLink]="notification.videoUrl">{{ notification.video.name }}</a> has been unblocked
        </div>
      </ng-container>
-      <ng-container *ngSwitchCase="UserNotificationType.BLACKLIST_ON_MY_VIDEO">
+      <ng-container *ngSwitchCase="UserNotificationType.BLOCK_ON_MY_VIDEO">
        <my-global-icon iconName="no"></my-global-icon>
        <div class="message" i18n>
-          Your video <a (click)="markAsRead(notification)" [routerLink]="notification.videoUrl">{{ notification.videoBlacklist.video.name }}</a> has been blacklisted
+          Your video <a (click)="markAsRead(notification)" [routerLink]="notification.videoUrl">{{ notification.videoBlacklist.video.name }}</a> has been blocked
        </div>
      </ng-container>
@@ -50,11 +50,11 @@
        </div>
      </ng-container>
-      <ng-container *ngSwitchCase="UserNotificationType.VIDEO_AUTO_BLACKLIST_FOR_MODERATORS">
+      <ng-container *ngSwitchCase="UserNotificationType.VIDEO_AUTO_BLOCK_FOR_MODERATORS">
        <my-global-icon iconName="no"></my-global-icon>
        <div class="message" i18n>
-          The recently added video <a (click)="markAsRead(notification)" [routerLink]="notification.videoUrl">{{ notification.videoBlacklist.video.name }}</a> has been <a (click)="markAsRead(notification)" [routerLink]="notification.videoAutoBlacklistUrl">auto-blacklisted</a>
+          The recently added video <a (click)="markAsRead(notification)" [routerLink]="notification.videoUrl">{{ notification.videoBlacklist.video.name }}</a> has been <a (click)="markAsRead(notification)" [routerLink]="notification.videoAutoBlacklistUrl">auto-blocked</a>
        </div>
      </ng-container>
diff --git a/client/src/app/shared/video-blacklist/index.ts b/client/src/app/shared/video-blacklist/index.ts
deleted file mode 100644
index bfb026441..000000000
--- a/client/src/app/shared/video-blacklist/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './video-blacklist.service'
diff --git a/client/src/app/shared/video-blacklist/video-blacklist.service.ts b/client/src/app/shared/video-blacklist/video-blacklist.service.ts
deleted file mode 100644
index c0e13a651..000000000
--- a/client/src/app/shared/video-blacklist/video-blacklist.service.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-import { catchError, map, concatMap, toArray } from 'rxjs/operators'
-import { HttpClient, HttpParams } from '@angular/common/http'
-import { Injectable } from '@angular/core'
-import { SortMeta } from 'primeng/api'
-import { from as observableFrom, Observable } from 'rxjs'
-import { VideoBlacklist, VideoBlacklistType, ResultList } from '../../../../../shared'
-import { Video } from '../video/video.model'
-import { environment } from '../../../environments/environment'
-import { RestExtractor, RestPagination, RestService } from '../rest'
-import { ComponentPaginationLight } from '../rest/component-pagination.model'
-@Injectable()
-export class VideoBlacklistService {
-  private static BASE_VIDEOS_URL = environment.apiUrl + '/api/v1/videos/'
-  constructor (
-    private authHttp: HttpClient,
-    private restService: RestService,
-    private restExtractor: RestExtractor
-  ) {}
-  listBlacklist (options: {
-    pagination: RestPagination,
-    sort: SortMeta,
-    search?: string
-    type?: VideoBlacklistType
-  }): Observable<ResultList<VideoBlacklist>> {
-    const { pagination, sort, search, type } = options
-    let params = new HttpParams()
-    params = this.restService.addRestGetParams(params, pagination, sort)
-    if (search) params = params.append('search', search)
-    if (type) params = params.append('type', type.toString())
-    return this.authHttp.get<ResultList<VideoBlacklist>>(VideoBlacklistService.BASE_VIDEOS_URL + 'blacklist', { params })
-               .pipe(
-                 map(res => this.restExtractor.convertResultListDateToHuman(res)),
-                 catchError(res => this.restExtractor.handleError(res))
-               )
-  }
-  getAutoBlacklistedAsVideoList (videoPagination: ComponentPaginationLight): Observable<ResultList<Video>> {
-    const pagination = this.restService.componentPaginationToRestPagination(videoPagination)
-    // prioritize first created since waiting longest
-    const AUTO_BLACKLIST_SORT = 'createdAt'
-    let params = new HttpParams()
-    params = this.restService.addRestGetParams(params, pagination, AUTO_BLACKLIST_SORT)
-    params = params.set('type', VideoBlacklistType.AUTO_BEFORE_PUBLISHED.toString())
-    return this.authHttp.get<ResultList<VideoBlacklist>>(VideoBlacklistService.BASE_VIDEOS_URL + 'blacklist', { params })
-              .pipe(
-                map(res => {
-                  return {
-                    total: res.total,
-                    data: res.data.map(videoBlacklist => new Video(videoBlacklist.video))
-                  }
-                }),
-                catchError(res => this.restExtractor.handleError(res))
-              )
-  }
-  removeVideoFromBlacklist (videoIdArgs: number | number[]) {
-    const videoIds = Array.isArray(videoIdArgs) ? videoIdArgs : [ videoIdArgs ]
-    return observableFrom(videoIds)
-      .pipe(
-        concatMap(id => this.authHttp.delete(VideoBlacklistService.BASE_VIDEOS_URL + id + '/blacklist')),
-        toArray(),
-        catchError(err => this.restExtractor.handleError(err))
-      )
-  }
-  blacklistVideo (videoId: number, reason: string, unfederate: boolean) {
-    const body = {
-      unfederate,
-      reason
-    }
-    return this.authHttp.post(VideoBlacklistService.BASE_VIDEOS_URL + videoId + '/blacklist', body)
-               .pipe(
-                 map(this.restExtractor.extractDataBool),
-                 catchError(res => this.restExtractor.handleError(res))
-               )
-  }
-}
diff --git a/client/src/app/shared/video-block/index.ts b/client/src/app/shared/video-block/index.ts
new file mode 100644
index 000000000..a99551a38
--- /dev/null
+++ b/client/src/app/shared/video-block/index.ts
@@ -0,0 +1 @@
+export * from './video-block.service'
diff --git a/client/src/app/shared/video-block/video-block.service.ts b/client/src/app/shared/video-block/video-block.service.ts
new file mode 100644
index 000000000..67ca1d85b
--- /dev/null
+++ b/client/src/app/shared/video-block/video-block.service.ts
@@ -0,0 +1,77 @@
+import { catchError, map, concatMap, toArray } from 'rxjs/operators'
+import { HttpClient, HttpParams } from '@angular/common/http'
+import { Injectable } from '@angular/core'
+import { SortMeta } from 'primeng/api'
+import { from as observableFrom, Observable } from 'rxjs'
+import { VideoBlocklist, VideoBlockType, ResultList } from '../../../../../shared'
+import { environment } from '../../../environments/environment'
+import { RestExtractor, RestPagination, RestService } from '../rest'
+@Injectable()
+export class VideoBlockService {
+  private static BASE_VIDEOS_URL = environment.apiUrl + '/api/v1/videos/'
+  constructor (
+    private authHttp: HttpClient,
+    private restService: RestService,
+    private restExtractor: RestExtractor
+  ) {}
+  listBlocks (options: {
+    pagination: RestPagination
+    sort: SortMeta
+    search?: string
+    type?: VideoBlockType
+  }): Observable<ResultList<VideoBlocklist>> {
+    const { pagination, sort, search, type } = options
+    let params = new HttpParams()
+    params = this.restService.addRestGetParams(params, pagination, sort)
+    if (search) {
+      const filters = this.restService.parseQueryStringFilter(search, {
+        type: {
+          prefix: 'type:',
+          handler: v => {
+            if (v === 'manual') return VideoBlockType.MANUAL
+            if (v === 'auto') return VideoBlockType.AUTO_BEFORE_PUBLISHED
+            return undefined
+          }
+        }
+      })
+      params = this.restService.addObjectParams(params, filters)
+    }
+    return this.authHttp.get<ResultList<VideoBlocklist>>(VideoBlockService.BASE_VIDEOS_URL + 'blacklist', { params })
+               .pipe(
+                 map(res => this.restExtractor.convertResultListDateToHuman(res)),
+                 catchError(res => this.restExtractor.handleError(res))
+               )
+  }
+  unblockVideo (videoIdArgs: number | number[]) {
+    const videoIds = Array.isArray(videoIdArgs) ? videoIdArgs : [ videoIdArgs ]
+    return observableFrom(videoIds)
+      .pipe(
+        concatMap(id => this.authHttp.delete(VideoBlockService.BASE_VIDEOS_URL + id + '/blacklist')),
+        toArray(),
+        catchError(err => this.restExtractor.handleError(err))
+      )
+  }
+  blockVideo (videoId: number, reason: string, unfederate: boolean) {
+    const body = {
+      unfederate,
+      reason
+    }
+    return this.authHttp.post(VideoBlockService.BASE_VIDEOS_URL + videoId + '/blacklist', body)
+               .pipe(
+                 map(this.restExtractor.extractDataBool),
+                 catchError(res => this.restExtractor.handleError(res))
+               )
+  }
+}
diff --git a/client/src/app/shared/video/abstract-video-list.html b/client/src/app/shared/video/abstract-video-list.html
index cd8a5b840..8ce3b25b0 100644
--- a/client/src/app/shared/video/abstract-video-list.html
+++ b/client/src/app/shared/video/abstract-video-list.html
@@ -39,7 +39,7 @@
        [fitWidth]="true"
        [video]="video" [user]="user" [ownerDisplayType]="ownerDisplayType"
        [displayVideoActions]="displayVideoActions" [displayOptions]="displayOptions"
-        (videoBlacklisted)="removeVideoFromArray(video)" (videoRemoved)="removeVideoFromArray(video)"
+        (videoBlocked)="removeVideoFromArray(video)" (videoRemoved)="removeVideoFromArray(video)"
      >
      </my-video-miniature>
    </ng-container>
diff --git a/client/src/app/shared/video/modals/video-blacklist.component.html b/client/src/app/shared/video/modals/video-block.component.html
index 8f06a6b02..a8dd30b5e 100644
--- a/client/src/app/shared/video/modals/video-blacklist.component.html
+++ b/client/src/app/shared/video/modals/video-block.component.html
@@ -1,12 +1,12 @@
 <ng-template #modal>
  <div class="modal-header">
-    <h4 i18n class="modal-title">Blacklist video</h4>
+    <h4 i18n class="modal-title">Blocklist video</h4>
    <my-global-icon iconName="cross" aria-label="Close" role="button" (click)="hide()"></my-global-icon>
  </div>
  <div class="modal-body">
-    <form novalidate [formGroup]="form" (ngSubmit)="blacklist()">
+    <form novalidate [formGroup]="form" (ngSubmit)="block()">
      <div class="form-group">
        <textarea
          i18n-placeholder placeholder="Reason..." formControlName="reason"
diff --git a/client/src/app/shared/video/modals/video-blacklist.component.scss b/client/src/app/shared/video/modals/video-block.component.scss
index afcdb9a16..afcdb9a16 100644
--- a/client/src/app/shared/video/modals/video-blacklist.component.scss
+++ b/client/src/app/shared/video/modals/video-block.component.scss
diff --git a/client/src/app/shared/video/modals/video-blacklist.component.ts b/client/src/app/shared/video/modals/video-block.component.ts
index 6ef9c250b..1a25e0578 100644
--- a/client/src/app/shared/video/modals/video-blacklist.component.ts
+++ b/client/src/app/shared/video/modals/video-block.component.ts
@@ -1,24 +1,24 @@
 import { Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'
 import { Notifier, RedirectService } from '@app/core'
-import { VideoBlacklistService } from '../../../shared/video-blacklist'
+import { VideoBlockService } from '../../video-block'
 import { I18n } from '@ngx-translate/i18n-polyfill'
 import { FormValidatorService } from '@app/shared/forms/form-validators/form-validator.service'
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap'
 import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap/modal/modal-ref'
-import { FormReactive, VideoBlacklistValidatorsService } from '@app/shared/forms'
+import { FormReactive, VideoBlockValidatorsService } from '@app/shared/forms'
 import { Video } from '@app/shared/video/video.model'
 @Component({
-  selector: 'my-video-blacklist',
+  selector: 'my-video-block',
-  templateUrl: './video-blacklist.component.html',
+  templateUrl: './video-block.component.html',
-  styleUrls: [ './video-blacklist.component.scss' ]
+  styleUrls: [ './video-block.component.scss' ]
 })
-export class VideoBlacklistComponent extends FormReactive implements OnInit {
+export class VideoBlockComponent extends FormReactive implements OnInit {
  @Input() video: Video = null
  @ViewChild('modal', { static: true }) modal: NgbModal
-  @Output() videoBlacklisted = new EventEmitter()
+  @Output() videoBlocked = new EventEmitter()
  error: string = null
@@ -27,10 +27,9 @@ export class VideoBlacklistComponent extends FormReactive implements OnInit {
  constructor (
    protected formValidatorService: FormValidatorService,
    private modalService: NgbModal,
-    private videoBlacklistValidatorsService: VideoBlacklistValidatorsService,
+    private videoBlockValidatorsService: VideoBlockValidatorsService,
-    private videoBlacklistService: VideoBlacklistService,
+    private videoBlocklistService: VideoBlockService,
    private notifier: Notifier,
-    private redirectService: RedirectService,
    private i18n: I18n
  ) {
    super()
@@ -40,7 +39,7 @@ export class VideoBlacklistComponent extends FormReactive implements OnInit {
    const defaultValues = { unfederate: 'true' }
    this.buildForm({
-      reason: this.videoBlacklistValidatorsService.VIDEO_BLACKLIST_REASON,
+      reason: this.videoBlockValidatorsService.VIDEO_BLOCK_REASON,
      unfederate: null
    }, defaultValues)
  }
@@ -54,20 +53,20 @@ export class VideoBlacklistComponent extends FormReactive implements OnInit {
    this.openedModal = null
  }
-  blacklist () {
+  block () {
    const reason = this.form.value[ 'reason' ] || undefined
    const unfederate = this.video.isLocal ? this.form.value[ 'unfederate' ] : undefined
-    this.videoBlacklistService.blacklistVideo(this.video.id, reason, unfederate)
+    this.videoBlocklistService.blockVideo(this.video.id, reason, unfederate)
        .subscribe(
          () => {
-            this.notifier.success(this.i18n('Video blacklisted.'))
+            this.notifier.success(this.i18n('Video blocked.'))
            this.hide()
            this.video.blacklisted = true
-            this.video.blacklistedReason = reason
+            this.video.blockedReason = reason
-            this.videoBlacklisted.emit()
+            this.videoBlocked.emit()
          },
          err => this.notifier.error(err.message)
diff --git a/client/src/app/shared/video/video-actions-dropdown.component.html b/client/src/app/shared/video/video-actions-dropdown.component.html
index ec03fa55d..3c8271b65 100644
--- a/client/src/app/shared/video/video-actions-dropdown.component.html
+++ b/client/src/app/shared/video/video-actions-dropdown.component.html
@@ -17,5 +17,5 @@
  <my-video-download #videoDownloadModal></my-video-download>
  <my-video-report #videoReportModal [video]="video"></my-video-report>
-  <my-video-blacklist #videoBlacklistModal [video]="video" (videoBlacklisted)="onVideoBlacklisted()"></my-video-blacklist>
+  <my-video-block #videoBlockModal [video]="video" (videoBlocked)="onVideoBlocked()"></my-video-block>
 </ng-container>
diff --git a/client/src/app/shared/video/video-actions-dropdown.component.ts b/client/src/app/shared/video/video-actions-dropdown.component.ts
index 4e5fc6476..1f5763610 100644
--- a/client/src/app/shared/video/video-actions-dropdown.component.ts
+++ b/client/src/app/shared/video/video-actions-dropdown.component.ts
@@ -9,8 +9,8 @@ import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap'
 import { VideoAddToPlaylistComponent } from '@app/shared/video-playlist/video-add-to-playlist.component'
 import { VideoDownloadComponent } from '@app/shared/video/modals/video-download.component'
 import { VideoReportComponent } from '@app/shared/video/modals/video-report.component'
-import { VideoBlacklistComponent } from '@app/shared/video/modals/video-blacklist.component'
+import { VideoBlockComponent } from '@app/shared/video/modals/video-block.component'
-import { VideoBlacklistService } from '@app/shared/video-blacklist'
+import { VideoBlockService } from '@app/shared/video-block'
 import { ScreenService } from '@app/shared/misc/screen.service'
 import { VideoCaption } from '@shared/models'
 import { RedundancyService } from '@app/shared/video/redundancy.service'
@@ -36,7 +36,7 @@ export class VideoActionsDropdownComponent implements OnChanges {
  @ViewChild('videoDownloadModal') videoDownloadModal: VideoDownloadComponent
  @ViewChild('videoReportModal') videoReportModal: VideoReportComponent
-  @ViewChild('videoBlacklistModal') videoBlacklistModal: VideoBlacklistComponent
+  @ViewChild('videoBlockModal') videoBlockModal: VideoBlockComponent
  @Input() video: Video | VideoDetails
  @Input() videoCaptions: VideoCaption[] = []
@@ -59,8 +59,8 @@ export class VideoActionsDropdownComponent implements OnChanges {
  @Input() buttonDirection: DropdownDirection = 'vertical'
  @Output() videoRemoved = new EventEmitter()
-  @Output() videoUnblacklisted = new EventEmitter()
+  @Output() videoUnblocked = new EventEmitter()
-  @Output() videoBlacklisted = new EventEmitter()
+  @Output() videoBlocked = new EventEmitter()
  @Output() modalOpened = new EventEmitter()
  videoActions: DropdownAction<{ video: Video }>[][] = []
@@ -71,7 +71,7 @@ export class VideoActionsDropdownComponent implements OnChanges {
    private authService: AuthService,
    private notifier: Notifier,
    private confirmService: ConfirmService,
-    private videoBlacklistService: VideoBlacklistService,
+    private videoBlocklistService: VideoBlockService,
    private screenService: ScreenService,
    private videoService: VideoService,
    private redundancyService: RedundancyService,
@@ -117,10 +117,10 @@ export class VideoActionsDropdownComponent implements OnChanges {
    this.videoReportModal.show()
  }
-  showBlacklistModal () {
+  showBlockModal () {
    this.modalOpened.emit()
-    this.videoBlacklistModal.show()
+    this.videoBlockModal.show()
  }
  /* Actions checker */
@@ -133,12 +133,12 @@ export class VideoActionsDropdownComponent implements OnChanges {
    return this.video.isRemovableBy(this.user)
  }
-  isVideoBlacklistable () {
+  isVideoBlockable () {
-    return this.video.isBlackistableBy(this.user)
+    return this.video.isBlockableBy(this.user)
  }
-  isVideoUnblacklistable () {
+  isVideoUnblockable () {
-    return this.video.isUnblacklistableBy(this.user)
+    return this.video.isUnblockableBy(this.user)
  }
  isVideoDownloadable () {
@@ -151,22 +151,22 @@ export class VideoActionsDropdownComponent implements OnChanges {
  /* Action handlers */
-  async unblacklistVideo () {
+  async unblockVideo () {
    const confirmMessage = this.i18n(
-      'Do you really want to remove this video from the blacklist? It will be available again in the videos list.'
+      'Do you really want to unblock this video? It will be available again in the videos list.'
    )
-    const res = await this.confirmService.confirm(confirmMessage, this.i18n('Unblacklist'))
+    const res = await this.confirmService.confirm(confirmMessage, this.i18n('Unblock'))
    if (res === false) return
-    this.videoBlacklistService.removeVideoFromBlacklist(this.video.id).subscribe(
+    this.videoBlocklistService.unblockVideo(this.video.id).subscribe(
      () => {
-        this.notifier.success(this.i18n('Video {{name}} removed from the blacklist.', { name: this.video.name }))
+        this.notifier.success(this.i18n('Video {{name}} unblocked.', { name: this.video.name }))
        this.video.blacklisted = false
-        this.video.blacklistedReason = null
+        this.video.blockedReason = null
-        this.videoUnblacklisted.emit()
+        this.videoUnblocked.emit()
      },
      err => this.notifier.error(err.message)
@@ -203,8 +203,8 @@ export class VideoActionsDropdownComponent implements OnChanges {
      )
  }
-  onVideoBlacklisted () {
+  onVideoBlocked () {
-    this.videoBlacklisted.emit()
+    this.videoBlocked.emit()
  }
  getPlaylistDropdownPlacement () {
@@ -239,16 +239,16 @@ export class VideoActionsDropdownComponent implements OnChanges {
          isDisplayed: () => this.authService.isLoggedIn() && this.displayOptions.update && this.isVideoUpdatable()
        },
        {
-          label: this.i18n('Blacklist'),
+          label: this.i18n('Block'),
-          handler: () => this.showBlacklistModal(),
+          handler: () => this.showBlockModal(),
          iconName: 'no',
-          isDisplayed: () => this.authService.isLoggedIn() && this.displayOptions.blacklist && this.isVideoBlacklistable()
+          isDisplayed: () => this.authService.isLoggedIn() && this.displayOptions.blacklist && this.isVideoBlockable()
        },
        {
-          label: this.i18n('Unblacklist'),
+          label: this.i18n('Unblock'),
-          handler: () => this.unblacklistVideo(),
+          handler: () => this.unblockVideo(),
          iconName: 'undo',
-          isDisplayed: () => this.authService.isLoggedIn() && this.displayOptions.blacklist && this.isVideoUnblacklistable()
+          isDisplayed: () => this.authService.isLoggedIn() && this.displayOptions.blacklist && this.isVideoUnblockable()
        },
        {
          label: this.i18n('Mirror'),
diff --git a/client/src/app/shared/video/video-miniature.component.html b/client/src/app/shared/video/video-miniature.component.html
index 3e23cf18c..575505f63 100644
--- a/client/src/app/shared/video/video-miniature.component.html
+++ b/client/src/app/shared/video/video-miniature.component.html
@@ -43,9 +43,9 @@
        </div>
      </div>
-      <div *ngIf="displayOptions.blacklistInfo && video.blacklisted" class="video-info-blacklisted">
+      <div *ngIf="displayOptions.blacklistInfo && video.blacklisted" class="video-info-blocked">
-        <span class="blacklisted-label" i18n>Blacklisted</span>
+        <span class="blocked-label" i18n>Blocked</span>
-        <span class="blacklisted-reason" *ngIf="video.blacklistedReason">{{ video.blacklistedReason }}</span>
+        <span class="blocked-reason" *ngIf="video.blockedReason">{{ video.blockedReason }}</span>
      </div>
      <div i18n *ngIf="displayOptions.nsfw && video.nsfw" class="video-info-nsfw">
@@ -57,7 +57,7 @@
      <!-- FIXME: remove bottom placement when overflow is fixed in bootstrap dropdown: https://github.com/ng-bootstrap/ng-bootstrap/issues/3495 -->
      <my-video-actions-dropdown
        *ngIf="showActions" [video]="video" [displayOptions]="videoActionsDisplayOptions" placement="bottom-left bottom-right left auto"
-        (videoRemoved)="onVideoRemoved()" (videoBlacklisted)="onVideoBlacklisted()" (videoUnblacklisted)="onVideoUnblacklisted()"
+        (videoRemoved)="onVideoRemoved()" (videoBlocked)="onVideoBlocked()" (videoUnblocked)="onVideoUnblocked()"
      ></my-video-actions-dropdown>
    </div>
  </div>
diff --git a/client/src/app/shared/video/video-miniature.component.scss b/client/src/app/shared/video/video-miniature.component.scss
index 849bd54bb..34f34f228 100644
--- a/client/src/app/shared/video/video-miniature.component.scss
+++ b/client/src/app/shared/video/video-miniature.component.scss
@@ -45,15 +45,15 @@ $more-margin-right: 15px;
      }
      .video-info-privacy,
-      .video-info-blacklisted .blacklisted-label,
+      .video-info-blocked .blocked-label,
      .video-info-nsfw {
        font-weight: $font-semibold;
      }
-      .video-info-blacklisted {
+      .video-info-blocked {
        color: red;
-        .blacklisted-reason::before {
+        .blocked-reason::before {
          content: ' - ';
        }
      }
@@ -160,7 +160,7 @@ $more-margin-right: 15px;
          margin-top: 5px;
        }
-        .video-info-blacklisted {
+        .video-info-blocked {
          margin-top: 3px;
        }
      }
diff --git a/client/src/app/shared/video/video-miniature.component.ts b/client/src/app/shared/video/video-miniature.component.ts
index aa1726ca7..f0b0992e2 100644
--- a/client/src/app/shared/video/video-miniature.component.ts
+++ b/client/src/app/shared/video/video-miniature.component.ts
@@ -59,8 +59,8 @@ export class VideoMiniatureComponent implements OnInit {
  @Input() useLazyLoadUrl = false
-  @Output() videoBlacklisted = new EventEmitter()
+  @Output() videoBlocked = new EventEmitter()
-  @Output() videoUnblacklisted = new EventEmitter()
+  @Output() videoUnblocked = new EventEmitter()
  @Output() videoRemoved = new EventEmitter()
  videoActionsDisplayOptions: VideoActionsDisplayType = {
@@ -184,12 +184,12 @@ export class VideoMiniatureComponent implements OnInit {
    this.loadWatchLater()
  }
-  onVideoBlacklisted () {
+  onVideoBlocked () {
-    this.videoBlacklisted.emit()
+    this.videoBlocked.emit()
  }
-  onVideoUnblacklisted () {
+  onVideoUnblocked () {
-    this.videoUnblacklisted.emit()
+    this.videoUnblocked.emit()
  }
  onVideoRemoved () {
diff --git a/client/src/app/shared/video/video.model.ts b/client/src/app/shared/video/video.model.ts
index 97759f9c1..2b3d915ef 100644
--- a/client/src/app/shared/video/video.model.ts
+++ b/client/src/app/shared/video/video.model.ts
@@ -54,7 +54,7 @@ export class Video implements VideoServerModel {
  state?: VideoConstant<VideoState>
  scheduledUpdate?: VideoScheduleUpdate
  blacklisted?: boolean
-  blacklistedReason?: string
+  blockedReason?: string
  account: {
    id: number
@@ -140,7 +140,7 @@ export class Video implements VideoServerModel {
    if (this.state) this.state.label = peertubeTranslate(this.state.label, translations)
    this.blacklisted = hash.blacklisted
-    this.blacklistedReason = hash.blacklistedReason
+    this.blockedReason = hash.blacklistedReason
    this.userHistory = hash.userHistory
@@ -163,12 +163,12 @@ export class Video implements VideoServerModel {
    return user && this.isLocal === true && (this.account.name === user.username || user.hasRight(UserRight.REMOVE_ANY_VIDEO))
  }
-  isBlackistableBy (user: AuthUser) {
+  isBlockableBy (user: AuthUser) {
-    return this.blacklisted !== true && user && user.hasRight(UserRight.MANAGE_VIDEO_BLACKLIST) === true
+    return this.blacklisted !== true && user && user.hasRight(UserRight.MANAGE_VIDEO_BLOCKS) === true
  }
-  isUnblacklistableBy (user: AuthUser) {
+  isUnblockableBy (user: AuthUser) {
-    return this.blacklisted === true && user && user.hasRight(UserRight.MANAGE_VIDEO_BLACKLIST) === true
+    return this.blacklisted === true && user && user.hasRight(UserRight.MANAGE_VIDEO_BLOCKS) === true
  }
  isUpdatableBy (user: AuthUser) {
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 433543a7b..63103e2e7 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.html
+++ b/client/src/app/videos/+video-watch/video-watch.component.html
@@ -29,8 +29,8 @@
    </div>
    <div class="col-md-12 alert alert-danger" *ngIf="video?.blacklisted">
-      <div class="blacklisted-label" i18n>This video is blacklisted.</div>
+      <div class="blocked-label" i18n>This video is blocked.</div>
-      {{ video.blacklistedReason }}
+      {{ video.blockedReason }}
    </div>
  </div>
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 8be0bab1d..e0d41117a 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.scss
+++ b/client/src/app/videos/+video-watch/video-watch.component.scss
@@ -45,7 +45,7 @@ $video-info-margin-left: 44px;
  }
 }
-.blacklisted-label {
+.blocked-label {
  font-weight: $font-semibold;
 }
diff --git a/client/src/app/videos/+video-watch/video-watch.component.ts b/client/src/app/videos/+video-watch/video-watch.component.ts
index 3790c7f6a..9f726cf35 100644
--- a/client/src/app/videos/+video-watch/video-watch.component.ts
+++ b/client/src/app/videos/+video-watch/video-watch.component.ts
@@ -335,7 +335,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
      this.videoCaptionService.listCaptions(videoId)
    ])
      .pipe(
-        // If 401, the video is private or blacklisted so redirect to 404
+        // If 401, the video is private or blocklisted so redirect to 404
        catchError(err => this.restExtractor.redirectTo404IfNotFound(err, [ 400, 401, 403, 404 ]))
      )
      .subscribe(([ video, captionsResult ]) => {
@@ -364,7 +364,7 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
    this.playlistService.getVideoPlaylist(playlistId)
      .pipe(
-        // If 401, the video is private or blacklisted so redirect to 404
+        // If 401, the video is private or blocklisted so redirect to 404
        catchError(err => this.restExtractor.redirectTo404IfNotFound(err, [ 400, 401, 403, 404 ]))
      )
      .subscribe(playlist => {
diff --git a/client/src/app/videos/recommendations/recommended-videos.component.html b/client/src/app/videos/recommendations/recommended-videos.component.html
index c6bdfee46..e4568c309 100644
--- a/client/src/app/videos/recommendations/recommended-videos.component.html
+++ b/client/src/app/videos/recommendations/recommended-videos.component.html
@@ -13,7 +13,7 @@
    </div>
    <div *ngFor="let video of (videos$ | async); let i = index; let length = count">
-      <my-video-miniature [displayOptions]="displayOptions" [video]="video" [user]="user" (videoBlacklisted)="onVideoRemoved()" (videoRemoved)="onVideoRemoved()">
+      <my-video-miniature [displayOptions]="displayOptions" [video]="video" [user]="user" (videoBlocked)="onVideoRemoved()" (videoRemoved)="onVideoRemoved()">
      </my-video-miniature>
      
      <hr *ngIf="!playlist && i == 0 && length > 1" />