From d473fd94ce2fd04bffc6cf6ee8f193db309c1d83 Mon Sep 17 00:00:00 2001 From: Rigel Kent Date: Sun, 28 Jun 2020 16:38:51 +0200 Subject: [PATCH] allow muting from the miniature options initial implementation with a listing refresh except on search results --- .../my-account-settings.component.html | 15 +++- .../recommended-videos.component.html | 2 +- .../shared-moderation/blocklist.service.ts | 8 +- .../abstract-video-list.html | 1 + .../video-actions-dropdown.component.ts | 76 +++++++++++++------ .../video-miniature.component.html | 2 +- .../video-miniature.component.ts | 8 +- server/models/video/video-comment.ts | 8 +- 8 files changed, 82 insertions(+), 38 deletions(-) diff --git a/client/src/app/+my-account/my-account-settings/my-account-settings.component.html b/client/src/app/+my-account/my-account-settings/my-account-settings.component.html index 26096da02..185f13275 100644 --- a/client/src/app/+my-account/my-account-settings/my-account-settings.component.html +++ b/client/src/app/+my-account/my-account-settings/my-account-settings.component.html @@ -1,11 +1,18 @@

Settings

-
-
- -
+
+
+
+
+ +
+
+ +
+ +
diff --git a/client/src/app/+videos/+video-watch/recommendations/recommended-videos.component.html b/client/src/app/+videos/+video-watch/recommendations/recommended-videos.component.html index 0467cabf5..1ab1b7343 100644 --- a/client/src/app/+videos/+video-watch/recommendations/recommended-videos.component.html +++ b/client/src/app/+videos/+video-watch/recommendations/recommended-videos.component.html @@ -15,7 +15,7 @@ + (videoBlocked)="onVideoRemoved()" (videoRemoved)="onVideoRemoved()" (videoAccountMuted)="onVideoRemoved()">
diff --git a/client/src/app/shared/shared-moderation/blocklist.service.ts b/client/src/app/shared/shared-moderation/blocklist.service.ts index 0caa92782..de677a77b 100644 --- a/client/src/app/shared/shared-moderation/blocklist.service.ts +++ b/client/src/app/shared/shared-moderation/blocklist.service.ts @@ -39,14 +39,14 @@ export class BlocklistService { ) } - blockAccountByUser (account: Account) { + blockAccountByUser (account: Pick) { const body = { accountName: account.nameWithHost } return this.authHttp.post(BlocklistService.BASE_USER_BLOCKLIST_URL + '/accounts', body) .pipe(catchError(err => this.restExtractor.handleError(err))) } - unblockAccountByUser (account: Account) { + unblockAccountByUser (account: Pick) { const path = BlocklistService.BASE_USER_BLOCKLIST_URL + '/accounts/' + account.nameWithHost return this.authHttp.delete(path) @@ -102,14 +102,14 @@ export class BlocklistService { ) } - blockAccountByInstance (account: Account) { + blockAccountByInstance (account: Pick) { const body = { accountName: account.nameWithHost } return this.authHttp.post(BlocklistService.BASE_SERVER_BLOCKLIST_URL + '/accounts', body) .pipe(catchError(err => this.restExtractor.handleError(err))) } - unblockAccountByInstance (account: Account) { + unblockAccountByInstance (account: Pick) { const path = BlocklistService.BASE_SERVER_BLOCKLIST_URL + '/accounts/' + account.nameWithHost return this.authHttp.delete(path) diff --git a/client/src/app/shared/shared-video-miniature/abstract-video-list.html b/client/src/app/shared/shared-video-miniature/abstract-video-list.html index 1e919ee72..9df0b5652 100644 --- a/client/src/app/shared/shared-video-miniature/abstract-video-list.html +++ b/client/src/app/shared/shared-video-miniature/abstract-video-list.html @@ -41,6 +41,7 @@ [video]="video" [user]="userMiniature" [ownerDisplayType]="ownerDisplayType" [displayVideoActions]="displayVideoActions" [displayOptions]="displayOptions" (videoBlocked)="removeVideoFromArray(video)" (videoRemoved)="removeVideoFromArray(video)" + (videoAccountMuted)="reloadVideos()" >
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..9bd0741df 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,15 +278,21 @@ 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' } + ], + [ // 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' + } ] ] } diff --git a/client/src/app/shared/shared-video-miniature/video-miniature.component.html b/client/src/app/shared/shared-video-miniature/video-miniature.component.html index 82afc866f..e5d91e69a 100644 --- a/client/src/app/shared/shared-video-miniature/video-miniature.component.html +++ b/client/src/app/shared/shared-video-miniature/video-miniature.component.html @@ -59,7 +59,7 @@
diff --git a/client/src/app/shared/shared-video-miniature/video-miniature.component.ts b/client/src/app/shared/shared-video-miniature/video-miniature.component.ts index 6f32977b3..e1adbb6ad 100644 --- a/client/src/app/shared/shared-video-miniature/video-miniature.component.ts +++ b/client/src/app/shared/shared-video-miniature/video-miniature.component.ts @@ -60,6 +60,7 @@ export class VideoMiniatureComponent implements OnInit { @Output() videoBlocked = new EventEmitter() @Output() videoUnblocked = new EventEmitter() @Output() videoRemoved = new EventEmitter() + @Output() videoAccountMuted = new EventEmitter() videoActionsDisplayOptions: VideoActionsDisplayType = { playlist: true, @@ -68,7 +69,8 @@ export class VideoMiniatureComponent implements OnInit { blacklist: true, delete: true, report: true, - duplicate: true + duplicate: true, + mute: true } showActions = false serverConfig: ServerConfig @@ -206,6 +208,10 @@ export class VideoMiniatureComponent implements OnInit { this.videoRemoved.emit() } + onVideoAccountMuted () { + this.videoAccountMuted.emit() + } + isUserLoggedIn () { return this.authService.isLoggedIn() } diff --git a/server/models/video/video-comment.ts b/server/models/video/video-comment.ts index c465eb3e7..90625d987 100644 --- a/server/models/video/video-comment.ts +++ b/server/models/video/video-comment.ts @@ -444,11 +444,11 @@ export class VideoCommentModel extends Model { } const accountWhere = accountId ? { - [Op.and]: { - ...accountExclusion, - [Op.eq]: accountId - } + [Op.and]: { + ...accountExclusion, + [Op.eq]: accountId } + } : accountExclusion const videoChannelWhere = videoChannelId ? { id: videoChannelId } : undefined