X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=client%2Fsrc%2Fapp%2Fshared%2Fshared-video-miniature%2Fvideo-actions-dropdown.component.ts;h=3d1fc8690e85fc9e1ef695d8e8d9ff61e84d0e08;hb=c41c0e28ed444fdb427f9803d2f123ba6f535fb9;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..3d1fc8690 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,10 @@ 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 { VideoBlockComponent, VideoBlockService, VideoReportComponent, BlocklistService } 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 { DropdownAction, DropdownButtonSize, DropdownDirection, RedundancyService, Video, VideoDetails, VideoService, Actor } from '../shared-main' import { VideoAddToPlaylistComponent } from '../shared-video-playlist' import { VideoDownloadComponent } from './video-download.component' @@ -16,6 +16,7 @@ export type VideoActionsDisplayType = { delete?: boolean report?: boolean duplicate?: boolean + mute?: boolean } @Component({ @@ -41,7 +42,8 @@ export class VideoActionsDropdownComponent implements OnChanges { blacklist: true, delete: true, report: true, - duplicate: true + duplicate: true, + mute: true } @Input() placement = 'left' @@ -54,6 +56,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,6 +67,7 @@ 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, @@ -142,6 +146,10 @@ export class VideoActionsDropdownComponent implements OnChanges { return this.video.canBeDuplicatedBy(this.user) } + isVideoAccountMutable () { + return this.video.account.id !== this.user.account.id + } + /* Action handlers */ async unblockVideo () { @@ -152,18 +160,19 @@ export class VideoActionsDropdownComponent implements OnChanges { const res = await this.confirmService.confirm(confirmMessage, this.i18n('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(this.i18n('Video {{name}} unblocked.', { name: this.video.name })) - 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 () { @@ -186,14 +195,29 @@ 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 = this.i18n('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(this.i18n('Account {{nameWithHost}} muted.', params)) + + this.videoAccountMuted.emit() + }, + + err => this.notifier.error(err.message) + ) } onVideoBlocked () { @@ -218,7 +242,7 @@ export class VideoActionsDropdownComponent implements OnChanges { iconName: 'playlist-add' } ], - [ + [ // actions regarding the video { label: this.i18n('Download'), handler: () => this.showDownloadModal(), @@ -254,14 +278,20 @@ export class VideoActionsDropdownComponent implements OnChanges { handler: () => this.removeVideo(), isDisplayed: () => this.authService.isLoggedIn() && this.displayOptions.delete && this.isVideoRemovable(), iconName: 'delete' - } - ], - [ + }, { label: this.i18n('Report'), handler: () => this.showReportModal(), isDisplayed: () => this.authService.isLoggedIn() && this.displayOptions.report, - iconName: 'alert' + iconName: 'flag' + } + ], + [ // actions regarding the account/its server + { + label: this.i18n('Mute account'), + handler: () => this.muteVideoAccount(), + isDisplayed: () => this.authService.isLoggedIn() && this.displayOptions.mute && this.isVideoAccountMutable(), + iconName: 'no' } ] ]