From 5baee5fca418487e72ddcd6419d31bca8659b668 Mon Sep 17 00:00:00 2001
From: Rigel Kent <sendmemail@rigelk.eu>
Date: Tue, 2 Jun 2020 20:50:42 +0200
Subject: rename blacklist to block/blocklist, merge block and auto-block views

- also replace whitelist with allowlist
- add advanced filters for video-block-list view
- move icons in video-block-list and video-abuse-list to left side
for visibility
- add robot icon to depict automated nature of a block in
video-block-list

resolves #2790
---
 shared/extra-utils/users/user-notifications.ts          | 6 +++---
 shared/extra-utils/videos/video-blacklist.ts            | 4 ++--
 shared/models/users/user-flag.model.ts                  | 2 +-
 shared/models/users/user-notification.model.ts          | 6 +++---
 shared/models/users/user-right.enum.ts                  | 2 +-
 shared/models/users/user-role.ts                        | 2 +-
 shared/models/videos/blacklist/video-blacklist.model.ts | 6 +++---
 7 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'shared')

diff --git a/shared/extra-utils/users/user-notifications.ts b/shared/extra-utils/users/user-notifications.ts
index bd00894c4..6f85bd450 100644
--- a/shared/extra-utils/users/user-notifications.ts
+++ b/shared/extra-utils/users/user-notifications.ts
@@ -455,7 +455,7 @@ async function checkNewVideoAbuseForModerators (base: CheckerBaseParams, videoUU
 }
 
 async function checkVideoAutoBlacklistForModerators (base: CheckerBaseParams, videoUUID: string, videoName: string, type: CheckerType) {
-  const notificationType = UserNotificationType.VIDEO_AUTO_BLACKLIST_FOR_MODERATORS
+  const notificationType = UserNotificationType.VIDEO_AUTO_BLOCK_FOR_MODERATORS
 
   function notificationChecker (notification: UserNotification, type: CheckerType) {
     if (type === 'presence') {
@@ -486,8 +486,8 @@ async function checkNewBlacklistOnMyVideo (
   blacklistType: 'blacklist' | 'unblacklist'
 ) {
   const notificationType = blacklistType === 'blacklist'
-    ? UserNotificationType.BLACKLIST_ON_MY_VIDEO
-    : UserNotificationType.UNBLACKLIST_ON_MY_VIDEO
+    ? UserNotificationType.BLOCK_ON_MY_VIDEO
+    : UserNotificationType.UNBLOCK_ON_MY_VIDEO
 
   function notificationChecker (notification: UserNotification) {
     expect(notification).to.not.be.undefined
diff --git a/shared/extra-utils/videos/video-blacklist.ts b/shared/extra-utils/videos/video-blacklist.ts
index ba139ef95..c06b2aa5d 100644
--- a/shared/extra-utils/videos/video-blacklist.ts
+++ b/shared/extra-utils/videos/video-blacklist.ts
@@ -1,5 +1,5 @@
 import * as request from 'supertest'
-import { VideoBlacklistType } from '../../models/videos'
+import { VideoBlockType } from '../../models/videos'
 import { makeGetRequest } from '..'
 
 function addVideoToBlacklist (
@@ -45,7 +45,7 @@ function getBlacklistedVideosList (parameters: {
   url: string
   token: string
   sort?: string
-  type?: VideoBlacklistType
+  type?: VideoBlockType
   specialStatus?: number
 }) {
   const { url, token, sort, type, specialStatus = 200 } = parameters
diff --git a/shared/models/users/user-flag.model.ts b/shared/models/users/user-flag.model.ts
index f5759f18f..e8b5a5c50 100644
--- a/shared/models/users/user-flag.model.ts
+++ b/shared/models/users/user-flag.model.ts
@@ -1,4 +1,4 @@
 export enum UserAdminFlag {
   NONE = 0,
-  BY_PASS_VIDEO_AUTO_BLACKLIST = 1 << 0
+  BYPASS_VIDEO_AUTO_BLOCK = 1 << 0
 }
diff --git a/shared/models/users/user-notification.model.ts b/shared/models/users/user-notification.model.ts
index e9be1ca7f..2329503a8 100644
--- a/shared/models/users/user-notification.model.ts
+++ b/shared/models/users/user-notification.model.ts
@@ -5,8 +5,8 @@ export enum UserNotificationType {
   NEW_COMMENT_ON_MY_VIDEO = 2,
   NEW_VIDEO_ABUSE_FOR_MODERATORS = 3,
 
-  BLACKLIST_ON_MY_VIDEO = 4,
-  UNBLACKLIST_ON_MY_VIDEO = 5,
+  BLOCK_ON_MY_VIDEO = 4,
+  UNBLOCK_ON_MY_VIDEO = 5,
 
   MY_VIDEO_PUBLISHED = 6,
 
@@ -17,7 +17,7 @@ export enum UserNotificationType {
   NEW_FOLLOW = 10,
   COMMENT_MENTION = 11,
 
-  VIDEO_AUTO_BLACKLIST_FOR_MODERATORS = 12,
+  VIDEO_AUTO_BLOCK_FOR_MODERATORS = 12,
 
   NEW_INSTANCE_FOLLOWER = 13,
 
diff --git a/shared/models/users/user-right.enum.ts b/shared/models/users/user-right.enum.ts
index 2f88a65de..3fb760709 100644
--- a/shared/models/users/user-right.enum.ts
+++ b/shared/models/users/user-right.enum.ts
@@ -20,7 +20,7 @@ export enum UserRight {
   MANAGE_ACCOUNTS_BLOCKLIST,
   MANAGE_SERVERS_BLOCKLIST,
 
-  MANAGE_VIDEO_BLACKLIST,
+  MANAGE_VIDEO_BLOCKS,
 
   REMOVE_ANY_VIDEO,
   REMOVE_ANY_VIDEO_CHANNEL,
diff --git a/shared/models/users/user-role.ts b/shared/models/users/user-role.ts
index 2b08b5850..30ec5edce 100644
--- a/shared/models/users/user-role.ts
+++ b/shared/models/users/user-role.ts
@@ -19,7 +19,7 @@ const userRoleRights: { [ id in UserRole ]: UserRight[] } = {
   ],
 
   [UserRole.MODERATOR]: [
-    UserRight.MANAGE_VIDEO_BLACKLIST,
+    UserRight.MANAGE_VIDEO_BLOCKS,
     UserRight.MANAGE_VIDEO_ABUSES,
     UserRight.REMOVE_ANY_VIDEO,
     UserRight.REMOVE_ANY_VIDEO_CHANNEL,
diff --git a/shared/models/videos/blacklist/video-blacklist.model.ts b/shared/models/videos/blacklist/video-blacklist.model.ts
index a6e0ef175..e6090b1e9 100644
--- a/shared/models/videos/blacklist/video-blacklist.model.ts
+++ b/shared/models/videos/blacklist/video-blacklist.model.ts
@@ -1,15 +1,15 @@
 import { Video } from '../video.model'
 
-export enum VideoBlacklistType {
+export enum VideoBlockType {
   MANUAL = 1,
   AUTO_BEFORE_PUBLISHED = 2
 }
 
-export interface VideoBlacklist {
+export interface VideoBlocklist {
   id: number
   unfederated: boolean
   reason?: string
-  type: VideoBlacklistType
+  type: VideoBlockType
 
   video: Video
 
-- 
cgit v1.2.3