X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2F%2Badmin%2Fmoderation%2Fvideo-block-list%2Fvideo-block-list.component.ts;h=8d67e9beb42b8c08b91f3e8ef506b2fe86dd1dad;hb=de61544582726713c965d3369902f4a464f72e20;hp=1fe8d0f9d38c5dac3fa19b5b1b3d11136923229f;hpb=33f6dce136ca6e969fe374efa099bee3f2a3599d;p=github%2FChocobozzz%2FPeerTube.git 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 1fe8d0f9d..8d67e9beb 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 @@ -1,6 +1,5 @@ import { SortMeta } from 'primeng/api' import { switchMap } from 'rxjs/operators' -import { buildVideoOrPlaylistEmbed } from 'src/assets/player/utils' import { environment } from 'src/environments/environment' import { Component, OnInit } from '@angular/core' import { ActivatedRoute, Router } from '@angular/router' @@ -8,6 +7,7 @@ import { ConfirmService, MarkdownService, Notifier, RestPagination, RestTable, S import { AdvancedInputFilter } from '@app/shared/shared-forms' 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' @@ -30,11 +30,11 @@ export class VideoBlockListComponent extends RestTable implements OnInit { title: $localize`Advanced filters`, children: [ { - queryParams: { search: 'type:auto' }, + value: 'type:auto', label: $localize`Automatic blocks` }, { - queryParams: { search: 'type:manual' }, + value: 'type:manual', label: $localize`Manual blocks` } ] @@ -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.`) @@ -145,15 +145,15 @@ export class VideoBlockListComponent extends RestTable implements OnInit { } getVideoEmbed (entry: VideoBlacklist) { - return buildVideoOrPlaylistEmbed( - decorateVideoLink({ + return buildVideoOrPlaylistEmbed({ + embedUrl: decorateVideoLink({ url: buildVideoEmbedLink(entry.video, environment.originServerUrl), title: false, warningTitle: false }), - entry.video.name - ) + embedTitle: entry.video.name + }) } protected reloadData () {