X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fshared%2Fshared-video-miniature%2Fvideo-actions-dropdown.component.ts;h=3c2b46d16d68e41d4e196cc486c1a75ac8dcf856;hb=f1ac63488c0050fec1c4d713d74db4f4ea944395;hp=db8d1c309e79fd0b03df11688d98e5faeed338d0;hpb=67ed6552b831df66713bac9e672738796128d33f;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts b/client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts index db8d1c309..3c2b46d16 100644 --- a/client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts +++ b/client/src/app/shared/shared-video-miniature/video-actions-dropdown.component.ts @@ -1,10 +1,19 @@ import { Component, EventEmitter, Input, OnChanges, Output, ViewChild } from '@angular/core' import { AuthService, ConfirmService, Notifier, ScreenService } from '@app/core' -import { VideoBlockComponent, VideoBlockService, VideoReportComponent } from '@app/shared/shared-moderation' +import { BlocklistService, VideoBlockComponent, VideoBlockService, VideoReportComponent } from '@app/shared/shared-moderation' import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap' -import { I18n } from '@ngx-translate/i18n-polyfill' import { VideoCaption } from '@shared/models' -import { DropdownAction, DropdownButtonSize, DropdownDirection, RedundancyService, Video, VideoDetails, VideoService } from '../shared-main' +import { + Actor, + DropdownAction, + DropdownButtonSize, + DropdownDirection, + RedundancyService, + Video, + VideoDetails, + VideoService +} from '../shared-main' +import { LiveStreamInformationComponent } from '../shared-video-live' import { VideoAddToPlaylistComponent } from '../shared-video-playlist' import { VideoDownloadComponent } from './video-download.component' @@ -16,6 +25,8 @@ export type VideoActionsDisplayType = { delete?: boolean report?: boolean duplicate?: boolean + mute?: boolean + liveInfo?: boolean } @Component({ @@ -30,6 +41,7 @@ export class VideoActionsDropdownComponent implements OnChanges { @ViewChild('videoDownloadModal') videoDownloadModal: VideoDownloadComponent @ViewChild('videoReportModal') videoReportModal: VideoReportComponent @ViewChild('videoBlockModal') videoBlockModal: VideoBlockComponent + @ViewChild('liveStreamInformationModal') liveStreamInformationModal: LiveStreamInformationComponent @Input() video: Video | VideoDetails @Input() videoCaptions: VideoCaption[] = [] @@ -41,7 +53,9 @@ export class VideoActionsDropdownComponent implements OnChanges { blacklist: true, delete: true, report: true, - duplicate: true + duplicate: true, + mute: true, + liveInfo: false } @Input() placement = 'left' @@ -54,6 +68,7 @@ export class VideoActionsDropdownComponent implements OnChanges { @Output() videoRemoved = new EventEmitter() @Output() videoUnblocked = new EventEmitter() @Output() videoBlocked = new EventEmitter() + @Output() videoAccountMuted = new EventEmitter() @Output() modalOpened = new EventEmitter() videoActions: DropdownAction<{ video: Video }>[][] = [] @@ -64,11 +79,11 @@ export class VideoActionsDropdownComponent implements OnChanges { private authService: AuthService, private notifier: Notifier, private confirmService: ConfirmService, + private blocklistService: BlocklistService, private videoBlocklistService: VideoBlockService, private screenService: ScreenService, private videoService: VideoService, - private redundancyService: RedundancyService, - private i18n: I18n + private redundancyService: RedundancyService ) { } get user () { @@ -78,7 +93,7 @@ export class VideoActionsDropdownComponent implements OnChanges { ngOnChanges () { if (this.loaded) { this.loaded = false - this.playlistAdd.reload() + if (this.playlistAdd) this.playlistAdd.reload() } this.buildActions() @@ -116,6 +131,12 @@ export class VideoActionsDropdownComponent implements OnChanges { this.videoBlockModal.show() } + showLiveInfoModal (video: Video) { + this.modalOpened.emit() + + this.liveStreamInformationModal.show(video) + } + /* Actions checker */ isVideoUpdatable () { @@ -134,49 +155,63 @@ export class VideoActionsDropdownComponent implements OnChanges { return this.video.isUnblockableBy(this.user) } + isVideoLiveInfoAvailable () { + return this.video.isLiveInfoAvailableBy(this.user) + } + isVideoDownloadable () { - return this.video && this.video instanceof VideoDetails && this.video.downloadEnabled + return this.video && + this.video.isLive !== true && + this.video instanceof VideoDetails && + this.video.downloadEnabled } canVideoBeDuplicated () { - return this.video.canBeDuplicatedBy(this.user) + return !this.video.isLive && this.video.canBeDuplicatedBy(this.user) + } + + isVideoAccountMutable () { + return this.video.account.id !== this.user.account.id } /* Action handlers */ async unblockVideo () { - const confirmMessage = this.i18n( - 'Do you really want to unblock this video? It will be available again in the videos list.' - ) + const confirmMessage = $localize`Do you really want to unblock this video? It will be available again in the videos list.` - const res = await this.confirmService.confirm(confirmMessage, this.i18n('Unblock')) + const res = await this.confirmService.confirm(confirmMessage, $localize`Unblock`) if (res === false) return - this.videoBlocklistService.unblockVideo(this.video.id).subscribe( - () => { - this.notifier.success(this.i18n('Video {{name}} unblocked.', { name: this.video.name })) + this.videoBlocklistService.unblockVideo(this.video.id) + .subscribe( + () => { + this.notifier.success($localize`Video ${this.video.name} unblocked.`) - this.video.blacklisted = false - this.video.blockedReason = null + this.video.blacklisted = false + this.video.blockedReason = null - this.videoUnblocked.emit() - }, + this.videoUnblocked.emit() + }, - err => this.notifier.error(err.message) - ) + err => this.notifier.error(err.message) + ) } async removeVideo () { this.modalOpened.emit() - const res = await this.confirmService.confirm(this.i18n('Do you really want to delete this video?'), this.i18n('Delete')) + let message = $localize`Do you really want to delete this video?` + if (this.video.isLive) { + message += ' ' + $localize`The live stream will be automatically terminated.` + } + + const res = await this.confirmService.confirm(message, $localize`Delete`) if (res === false) return this.videoService.removeVideo(this.video.id) .subscribe( () => { - this.notifier.success(this.i18n('Video {{videoName}} deleted.', { videoName: this.video.name })) - + this.notifier.success($localize`Video ${this.video.name} deleted.`) this.videoRemoved.emit() }, @@ -186,14 +221,28 @@ export class VideoActionsDropdownComponent implements OnChanges { duplicateVideo () { this.redundancyService.addVideoRedundancy(this.video) - .subscribe( - () => { - const message = this.i18n('This video will be duplicated by your instance.') - this.notifier.success(message) - }, + .subscribe( + () => { + const message = $localize`This video will be duplicated by your instance.` + this.notifier.success(message) + }, - err => this.notifier.error(err.message) - ) + err => this.notifier.error(err.message) + ) + } + + muteVideoAccount () { + const params = { nameWithHost: Actor.CREATE_BY_STRING(this.video.account.name, this.video.account.host) } + + this.blocklistService.blockAccountByUser(params) + .subscribe( + () => { + this.notifier.success($localize`Account ${params.nameWithHost} muted.`) + this.videoAccountMuted.emit() + }, + + err => this.notifier.error(err.message) + ) } onVideoBlocked () { @@ -212,56 +261,68 @@ export class VideoActionsDropdownComponent implements OnChanges { this.videoActions = [ [ { - label: this.i18n('Save to playlist'), + label: $localize`Save to playlist`, handler: () => this.playlistDropdown.toggle(), isDisplayed: () => this.authService.isLoggedIn() && this.displayOptions.playlist, iconName: 'playlist-add' } ], - [ + [ // actions regarding the video { - label: this.i18n('Download'), + label: $localize`Download`, handler: () => this.showDownloadModal(), isDisplayed: () => this.displayOptions.download && this.isVideoDownloadable(), iconName: 'download' }, { - label: this.i18n('Update'), + label: $localize`Display live information`, + handler: ({ video }) => this.showLiveInfoModal(video), + isDisplayed: () => this.displayOptions.liveInfo && this.isVideoLiveInfoAvailable(), + iconName: 'live' + }, + { + label: $localize`Update`, linkBuilder: ({ video }) => [ '/videos/update', video.uuid ], iconName: 'edit', isDisplayed: () => this.authService.isLoggedIn() && this.displayOptions.update && this.isVideoUpdatable() }, { - label: this.i18n('Block'), + label: $localize`Block`, handler: () => this.showBlockModal(), iconName: 'no', isDisplayed: () => this.authService.isLoggedIn() && this.displayOptions.blacklist && this.isVideoBlockable() }, { - label: this.i18n('Unblock'), + label: $localize`Unblock`, handler: () => this.unblockVideo(), iconName: 'undo', isDisplayed: () => this.authService.isLoggedIn() && this.displayOptions.blacklist && this.isVideoUnblockable() }, { - label: this.i18n('Mirror'), + label: $localize`Mirror`, handler: () => this.duplicateVideo(), isDisplayed: () => this.authService.isLoggedIn() && this.displayOptions.duplicate && this.canVideoBeDuplicated(), iconName: 'cloud-download' }, { - label: this.i18n('Delete'), + label: $localize`Delete`, handler: () => this.removeVideo(), isDisplayed: () => this.authService.isLoggedIn() && this.displayOptions.delete && this.isVideoRemovable(), iconName: 'delete' - } - ], - [ + }, { - label: this.i18n('Report'), + label: $localize`Report`, handler: () => this.showReportModal(), isDisplayed: () => this.authService.isLoggedIn() && this.displayOptions.report, - iconName: 'alert' + iconName: 'flag' + } + ], + [ // actions regarding the account/its server + { + label: $localize`Mute account`, + handler: () => this.muteVideoAccount(), + isDisplayed: () => this.authService.isLoggedIn() && this.displayOptions.mute && this.isVideoAccountMutable(), + iconName: 'no' } ] ]