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
index dca746f4e..67752c15a 100644
--- 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
@@ -64,7 +64,7 @@ export class VideoBlockListComponent extends RestTable implements OnInit {
label: $localize`Switch video block to manual`,
handler: videoBlock => {
this.videoBlocklistService.unblockVideo(videoBlock.video.id).pipe(
- switchMap(_ => this.videoBlocklistService.blockVideo(videoBlock.video.id, undefined, true))
+ switchMap(_ => this.videoBlocklistService.blockVideo([ { videoId: videoBlock.video.id, unfederate: true } ]))
).subscribe({
next: () => {
this.notifier.success($localize`Video ${videoBlock.video.name} switched to manual block.`)
diff --git a/client/src/app/+admin/overview/videos/video-list.component.html b/client/src/app/+admin/overview/videos/video-list.component.html
index 6b0dc3abd..9b536ec11 100644
--- a/client/src/app/+admin/overview/videos/video-list.component.html
+++ b/client/src/app/+admin/overview/videos/video-list.component.html
@@ -126,3 +126,5 @@
+
+
diff --git a/client/src/app/+admin/overview/videos/video-list.component.ts b/client/src/app/+admin/overview/videos/video-list.component.ts
index 0f98a5d33..7f268bb23 100644
--- a/client/src/app/+admin/overview/videos/video-list.component.ts
+++ b/client/src/app/+admin/overview/videos/video-list.component.ts
@@ -1,10 +1,11 @@
import { SortMeta } from 'primeng/api'
import { finalize } from 'rxjs/operators'
-import { Component, OnInit } from '@angular/core'
+import { Component, OnInit, ViewChild } from '@angular/core'
import { ActivatedRoute, Router } from '@angular/router'
import { AuthService, ConfirmService, Notifier, RestPagination, RestTable } from '@app/core'
import { AdvancedInputFilter } from '@app/shared/shared-forms'
import { DropdownAction, Video, VideoService } from '@app/shared/shared-main'
+import { VideoBlockComponent, VideoBlockService } from '@app/shared/shared-moderation'
import { VideoActionsDisplayType } from '@app/shared/shared-video-miniature'
import { UserRight, VideoPrivacy, VideoState, VideoStreamingPlaylistType } from '@shared/models'
import { VideoAdminService } from './video-admin.service'
@@ -15,6 +16,8 @@ import { VideoAdminService } from './video-admin.service'
styleUrls: [ './video-list.component.scss' ]
})
export class VideoListComponent extends RestTable implements OnInit {
+ @ViewChild('videoBlockModal') videoBlockModal: VideoBlockComponent
+
videos: Video[] = []
totalRecords = 0
@@ -48,7 +51,8 @@ export class VideoListComponent extends RestTable implements OnInit {
private auth: AuthService,
private notifier: Notifier,
private videoService: VideoService,
- private videoAdminService: VideoAdminService
+ private videoAdminService: VideoAdminService,
+ private videoBlockService: VideoBlockService
) {
super()
}
@@ -68,6 +72,16 @@ export class VideoListComponent extends RestTable implements OnInit {
label: $localize`Delete`,
handler: videos => this.removeVideos(videos),
isDisplayed: () => this.authUser.hasRight(UserRight.REMOVE_ANY_VIDEO)
+ },
+ {
+ label: $localize`Block`,
+ handler: videos => this.videoBlockModal.show(videos),
+ isDisplayed: videos => this.authUser.hasRight(UserRight.MANAGE_VIDEO_BLACKLIST) && videos.every(v => !v.blacklisted)
+ },
+ {
+ label: $localize`Unblock`,
+ handler: videos => this.unblockVideos(videos),
+ isDisplayed: videos => this.authUser.hasRight(UserRight.MANAGE_VIDEO_BLACKLIST) && videos.every(v => v.blacklisted)
}
]
]
@@ -132,6 +146,10 @@ export class VideoListComponent extends RestTable implements OnInit {
return files.reduce((p, f) => p += f.size, 0)
}
+ onVideoBlocked () {
+ this.reloadData()
+ }
+
protected reloadData () {
this.selectedVideos = []
@@ -160,7 +178,19 @@ export class VideoListComponent extends RestTable implements OnInit {
this.videoService.removeVideo(videos.map(v => v.id))
.subscribe({
next: () => {
- this.notifier.success($localize`${videos.length} videos deleted.`)
+ this.notifier.success($localize`Deleted ${videos.length} videos.`)
+ this.reloadData()
+ },
+
+ error: err => this.notifier.error(err.message)
+ })
+ }
+
+ private unblockVideos (videos: Video[]) {
+ this.videoBlockService.unblockVideo(videos.map(v => v.id))
+ .subscribe({
+ next: () => {
+ this.notifier.success($localize`Unblocked ${videos.length} videos.`)
this.reloadData()
},
diff --git a/client/src/app/shared/shared-abuse-list/abuse-list-table.component.html b/client/src/app/shared/shared-abuse-list/abuse-list-table.component.html
index d0eef7d4b..0d75a21d7 100644
--- a/client/src/app/shared/shared-abuse-list/abuse-list-table.component.html
+++ b/client/src/app/shared/shared-abuse-list/abuse-list-table.component.html
@@ -77,10 +77,6 @@
-
- Deleted
-
-
{{ abuse.video.name }}
diff --git a/client/src/app/shared/shared-abuse-list/abuse-list-table.component.ts b/client/src/app/shared/shared-abuse-list/abuse-list-table.component.ts
index b902726fa..08cf297cc 100644
--- a/client/src/app/shared/shared-abuse-list/abuse-list-table.component.ts
+++ b/client/src/app/shared/shared-abuse-list/abuse-list-table.component.ts
@@ -338,7 +338,7 @@ export class AbuseListTableComponent extends RestTable implements OnInit {
label: $localize`Block video`,
isDisplayed: abuse => abuse.video && !abuse.video.deleted && !abuse.video.blacklisted,
handler: abuse => {
- this.videoBlocklistService.blockVideo(abuse.video.id, undefined, abuse.video.channel.isLocal)
+ this.videoBlocklistService.blockVideo([ { videoId: abuse.video.id, unfederate: abuse.video.channel.isLocal } ])
.subscribe({
next: () => {
this.notifier.success($localize`Video blocked.`)
diff --git a/client/src/app/shared/shared-moderation/video-block.component.html b/client/src/app/shared/shared-moderation/video-block.component.html
index 5e9e8493c..e5793f2ca 100644
--- a/client/src/app/shared/shared-moderation/video-block.component.html
+++ b/client/src/app/shared/shared-moderation/video-block.component.html
@@ -1,7 +1,14 @@
@@ -18,19 +25,20 @@
- |