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 /server/lib/notifier.ts | |
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 'server/lib/notifier.ts')
-rw-r--r-- | server/lib/notifier.ts | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/server/lib/notifier.ts b/server/lib/notifier.ts index 89f91e031..3e90bb57e 100644 --- a/server/lib/notifier.ts +++ b/server/lib/notifier.ts | |||
@@ -387,7 +387,7 @@ class Notifier { | |||
387 | } | 387 | } |
388 | 388 | ||
389 | private async notifyModeratorsOfVideoAutoBlacklist (videoBlacklist: MVideoBlacklistLightVideo) { | 389 | private async notifyModeratorsOfVideoAutoBlacklist (videoBlacklist: MVideoBlacklistLightVideo) { |
390 | const moderators = await UserModel.listWithRight(UserRight.MANAGE_VIDEO_BLACKLIST) | 390 | const moderators = await UserModel.listWithRight(UserRight.MANAGE_VIDEO_BLOCKS) |
391 | if (moderators.length === 0) return | 391 | if (moderators.length === 0) return |
392 | 392 | ||
393 | logger.info('Notifying %s moderators of video auto-blacklist %s.', moderators.length, videoBlacklist.Video.url) | 393 | logger.info('Notifying %s moderators of video auto-blacklist %s.', moderators.length, videoBlacklist.Video.url) |
@@ -398,7 +398,7 @@ class Notifier { | |||
398 | 398 | ||
399 | async function notificationCreator (user: MUserWithNotificationSetting) { | 399 | async function notificationCreator (user: MUserWithNotificationSetting) { |
400 | const notification = await UserNotificationModel.create<UserNotificationModelForApi>({ | 400 | const notification = await UserNotificationModel.create<UserNotificationModelForApi>({ |
401 | type: UserNotificationType.VIDEO_AUTO_BLACKLIST_FOR_MODERATORS, | 401 | type: UserNotificationType.VIDEO_AUTO_BLOCK_FOR_MODERATORS, |
402 | userId: user.id, | 402 | userId: user.id, |
403 | videoBlacklistId: videoBlacklist.id | 403 | videoBlacklistId: videoBlacklist.id |
404 | }) | 404 | }) |
@@ -426,7 +426,7 @@ class Notifier { | |||
426 | 426 | ||
427 | async function notificationCreator (user: MUserWithNotificationSetting) { | 427 | async function notificationCreator (user: MUserWithNotificationSetting) { |
428 | const notification = await UserNotificationModel.create<UserNotificationModelForApi>({ | 428 | const notification = await UserNotificationModel.create<UserNotificationModelForApi>({ |
429 | type: UserNotificationType.BLACKLIST_ON_MY_VIDEO, | 429 | type: UserNotificationType.BLOCK_ON_MY_VIDEO, |
430 | userId: user.id, | 430 | userId: user.id, |
431 | videoBlacklistId: videoBlacklist.id | 431 | videoBlacklistId: videoBlacklist.id |
432 | }) | 432 | }) |
@@ -454,7 +454,7 @@ class Notifier { | |||
454 | 454 | ||
455 | async function notificationCreator (user: MUserWithNotificationSetting) { | 455 | async function notificationCreator (user: MUserWithNotificationSetting) { |
456 | const notification = await UserNotificationModel.create<UserNotificationModelForApi>({ | 456 | const notification = await UserNotificationModel.create<UserNotificationModelForApi>({ |
457 | type: UserNotificationType.UNBLACKLIST_ON_MY_VIDEO, | 457 | type: UserNotificationType.UNBLOCK_ON_MY_VIDEO, |
458 | userId: user.id, | 458 | userId: user.id, |
459 | videoId: video.id | 459 | videoId: video.id |
460 | }) | 460 | }) |