diff options
author | Rigel Kent <sendmemail@rigelk.eu> | 2020-06-02 20:50:42 +0200 |
---|---|---|
committer | Rigel Kent <sendmemail@rigelk.eu> | 2020-06-10 21:12:05 +0200 |
commit | 5baee5fca418487e72ddcd6419d31bca8659b668 (patch) | |
tree | 6604cc16d42152f4929d888565d2d435e2480d47 /shared/extra-utils/users | |
parent | d840487fed32b4604b02030c0d7464afa925904f (diff) | |
download | PeerTube-5baee5fca418487e72ddcd6419d31bca8659b668.tar.gz PeerTube-5baee5fca418487e72ddcd6419d31bca8659b668.tar.zst PeerTube-5baee5fca418487e72ddcd6419d31bca8659b668.zip |
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
Diffstat (limited to 'shared/extra-utils/users')
-rw-r--r-- | shared/extra-utils/users/user-notifications.ts | 6 |
1 files changed, 3 insertions, 3 deletions
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 | |||
455 | } | 455 | } |
456 | 456 | ||
457 | async function checkVideoAutoBlacklistForModerators (base: CheckerBaseParams, videoUUID: string, videoName: string, type: CheckerType) { | 457 | async function checkVideoAutoBlacklistForModerators (base: CheckerBaseParams, videoUUID: string, videoName: string, type: CheckerType) { |
458 | const notificationType = UserNotificationType.VIDEO_AUTO_BLACKLIST_FOR_MODERATORS | 458 | const notificationType = UserNotificationType.VIDEO_AUTO_BLOCK_FOR_MODERATORS |
459 | 459 | ||
460 | function notificationChecker (notification: UserNotification, type: CheckerType) { | 460 | function notificationChecker (notification: UserNotification, type: CheckerType) { |
461 | if (type === 'presence') { | 461 | if (type === 'presence') { |
@@ -486,8 +486,8 @@ async function checkNewBlacklistOnMyVideo ( | |||
486 | blacklistType: 'blacklist' | 'unblacklist' | 486 | blacklistType: 'blacklist' | 'unblacklist' |
487 | ) { | 487 | ) { |
488 | const notificationType = blacklistType === 'blacklist' | 488 | const notificationType = blacklistType === 'blacklist' |
489 | ? UserNotificationType.BLACKLIST_ON_MY_VIDEO | 489 | ? UserNotificationType.BLOCK_ON_MY_VIDEO |
490 | : UserNotificationType.UNBLACKLIST_ON_MY_VIDEO | 490 | : UserNotificationType.UNBLOCK_ON_MY_VIDEO |
491 | 491 | ||
492 | function notificationChecker (notification: UserNotification) { | 492 | function notificationChecker (notification: UserNotification) { |
493 | expect(notification).to.not.be.undefined | 493 | expect(notification).to.not.be.undefined |