import { SortMeta } from 'primeng/api'
import { switchMap } from 'rxjs/operators'
-import { buildVideoLink, buildVideoOrPlaylistEmbed } from 'src/assets/player/utils'
import { environment } from 'src/environments/environment'
import { Component, OnInit } from '@angular/core'
-import { DomSanitizer } from '@angular/platform-browser'
import { ActivatedRoute, Router } from '@angular/router'
import { ConfirmService, MarkdownService, Notifier, RestPagination, RestTable, ServerService } from '@app/core'
import { AdvancedInputFilter } from '@app/shared/shared-forms'
-import { DropdownAction, Video, VideoService } from '@app/shared/shared-main'
+import { DropdownAction, VideoService } from '@app/shared/shared-main'
import { VideoBlockService } from '@app/shared/shared-moderation'
+import { buildVideoOrPlaylistEmbed } from '@root-helpers/video'
+import { buildVideoEmbedLink, decorateVideoLink } from '@shared/core-utils'
import { VideoBlacklist, VideoBlacklistType } from '@shared/models'
@Component({
styleUrls: [ '../../../shared/shared-moderation/moderation.scss', './video-block-list.component.scss' ]
})
export class VideoBlockListComponent extends RestTable implements OnInit {
- blocklist: (VideoBlacklist & { reasonHtml?: string, embedHtml?: string })[] = []
+ blocklist: (VideoBlacklist & { reasonHtml?: string })[] = []
totalRecords = 0
sort: SortMeta = { field: 'createdAt', order: -1 }
pagination: RestPagination = { count: this.rowsPerPage, start: 0 }
inputFilters: AdvancedInputFilter[] = [
{
- queryParams: { 'search': 'type:auto' },
- label: $localize`Automatic blocks`
- },
- {
- queryParams: { 'search': 'type:manual' },
- label: $localize`Manual blocks`
+ title: $localize`Advanced filters`,
+ children: [
+ {
+ value: 'type:auto',
+ label: $localize`Automatic blocks`
+ },
+ {
+ value: 'type:manual',
+ label: $localize`Manual blocks`
+ }
+ ]
}
]
private confirmService: ConfirmService,
private videoBlocklistService: VideoBlockService,
private markdownRenderer: MarkdownService,
- private sanitizer: DomSanitizer,
private videoService: VideoService
) {
super()
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))
- ).subscribe(
- () => {
+ switchMap(_ => this.videoBlocklistService.blockVideo([ { videoId: videoBlock.video.id, unfederate: true } ]))
+ ).subscribe({
+ next: () => {
this.notifier.success($localize`Video ${videoBlock.video.name} switched to manual block.`)
this.reloadData()
},
- err => this.notifier.error(err.message)
- )
+ error: err => this.notifier.error(err.message)
+ })
},
isDisplayed: videoBlock => videoBlock.type === VideoBlacklistType.AUTO_BEFORE_PUBLISHED
}
if (res === false) return
this.videoService.removeVideo(videoBlock.video.id)
- .subscribe(
- () => {
+ .subscribe({
+ next: () => {
this.notifier.success($localize`Video deleted.`)
+ this.reloadData()
},
- err => this.notifier.error(err.message)
- )
+ error: err => this.notifier.error(err.message)
+ })
}
}
]
return 'VideoBlockListComponent'
}
- getVideoUrl (videoBlock: VideoBlacklist) {
- return Video.buildWatchUrl(videoBlock.video)
- }
-
toHtml (text: string) {
return this.markdownRenderer.textMarkdownToHTML(text)
}
const res = await this.confirmService.confirm(confirmMessage, $localize`Unblock`)
if (res === false) return
- this.videoBlocklistService.unblockVideo(entry.video.id).subscribe(
- () => {
- this.notifier.success($localize`Video ${entry.video.name} unblocked.`)
- this.reloadData()
- },
+ this.videoBlocklistService.unblockVideo(entry.video.id)
+ .subscribe({
+ next: () => {
+ this.notifier.success($localize`Video ${entry.video.name} unblocked.`)
+ this.reloadData()
+ },
- err => this.notifier.error(err.message)
- )
+ error: err => this.notifier.error(err.message)
+ })
}
getVideoEmbed (entry: VideoBlacklist) {
- return buildVideoOrPlaylistEmbed(
- buildVideoLink({
- baseUrl: `${environment.originServerUrl}/videos/embed/${entry.video.uuid}`,
+ return buildVideoOrPlaylistEmbed({
+ embedUrl: decorateVideoLink({
+ url: buildVideoEmbedLink(entry.video, environment.originServerUrl),
+
title: false,
warningTitle: false
}),
- entry.video.name
- )
+ embedTitle: entry.video.name
+ })
}
protected reloadData () {
sort: this.sort,
search: this.search
})
- .subscribe(
- async resultList => {
+ .subscribe({
+ next: async resultList => {
this.totalRecords = resultList.total
this.blocklist = resultList.data
for (const element of this.blocklist) {
Object.assign(element, {
- reasonHtml: await this.toHtml(element.reason),
- embedHtml: this.sanitizer.bypassSecurityTrustHtml(this.getVideoEmbed(element))
+ reasonHtml: await this.toHtml(element.reason)
})
}
},
- err => this.notifier.error(err.message)
- )
+ error: err => this.notifier.error(err.message)
+ })
}
}