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

1 files changed, 2 insertions, 2 deletions

diff --git a/server/models/account/user.ts b/server/models/account/user.ts
index fbd3080c6..4ea175583 100644
--- a/server/models/account/user.ts
+++ b/server/models/account/user.ts
@@ -739,11 +739,11 @@ export class UserModel extends Model<UserModel> {
     const videoUserId = video.VideoChannel.Account.userId
 
     if (video.isBlacklisted()) {
-      return videoUserId === this.id || this.hasRight(UserRight.MANAGE_VIDEO_BLACKLIST)
+      return videoUserId === this.id || this.hasRight(UserRight.MANAGE_VIDEO_BLOCKS)
     }
 
     if (video.privacy === VideoPrivacy.PRIVATE) {
-      return video.VideoChannel && videoUserId === this.id || this.hasRight(UserRight.MANAGE_VIDEO_BLACKLIST)
+      return video.VideoChannel && videoUserId === this.id || this.hasRight(UserRight.MANAGE_VIDEO_BLOCKS)
     }
 
     if (video.privacy === VideoPrivacy.INTERNAL) return true