From 4faa4b4eae5e1dcdcad3d924b9a19d078d11de57 Mon Sep 17 00:00:00 2001 From: Rigel Kent Date: Mon, 13 Apr 2020 19:58:47 +0200 Subject: [PATCH 1/9] Predefined report reasons reporter UI --- .../moderation/moderation.component.scss | 14 +++ .../video-abuse-details.component.html | 9 ++ .../video-abuse-details.component.ts | 24 +++- .../video-abuse-list.component.ts | 11 +- client/src/app/shared/video-abuse/index.ts | 1 + .../video-abuse-predefined-reasons.model.ts | 14 +++ .../shared/video-abuse/video-abuse.service.ts | 9 +- .../video/modals/video-block.component.html | 4 +- .../video/modals/video-report.component.html | 105 ++++++++++++++---- .../video/modals/video-report.component.scss | 17 +++ .../video/modals/video-report.component.ts | 89 ++++++++++++++- client/src/app/shared/video/video.model.ts | 3 +- client/src/environments/environment.e2e.ts | 3 +- client/src/environments/environment.hmr.ts | 3 +- client/src/environments/environment.prod.ts | 3 +- client/src/environments/environment.ts | 3 +- client/src/sass/player/peertube-skin.scss | 2 +- server/controllers/api/videos/abuse.ts | 23 +++- .../helpers/custom-validators/video-abuses.ts | 16 ++- server/initializers/constants.ts | 2 +- server/initializers/database.ts | 6 +- .../migrations/0515-video-abuse-reason.ts | 28 +++++ .../migrations/0520-video-abuse-timestamp.ts | 28 +++++ .../validators/videos/video-abuses.ts | 22 +++- server/models/video/abuse-reason.ts | 27 +++++ server/models/video/video-abuse-reason.ts | 30 +++++ server/models/video/video-abuse.ts | 37 +++++- .../videos/abuse/video-abuse-create.model.ts | 2 + .../videos/abuse/video-abuse-reason.model.ts | 21 ++++ .../models/videos/abuse/video-abuse.model.ts | 4 + shared/models/videos/index.ts | 1 + 31 files changed, 499 insertions(+), 62 deletions(-) create mode 100644 client/src/app/shared/video-abuse/video-abuse-predefined-reasons.model.ts create mode 100644 server/initializers/migrations/0515-video-abuse-reason.ts create mode 100644 server/initializers/migrations/0520-video-abuse-timestamp.ts create mode 100644 server/models/video/abuse-reason.ts create mode 100644 server/models/video/video-abuse-reason.ts create mode 100644 shared/models/videos/abuse/video-abuse-reason.model.ts diff --git a/client/src/app/+admin/moderation/moderation.component.scss b/client/src/app/+admin/moderation/moderation.component.scss index ba68cf6f698..0ec420af9bb 100644 --- a/client/src/app/+admin/moderation/moderation.component.scss +++ b/client/src/app/+admin/moderation/moderation.component.scss @@ -42,6 +42,20 @@ } } +p-calendar { + display: block; + + ::ng-deep { + .ui-widget-content { + min-width: 400px; + } + + input { + @include peertube-input-text(100%); + } + } +} + .screenratio { div { @include miniature-thumbnail; diff --git a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.html b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.html index 453a282d1c8..a29fadca85c 100644 --- a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.html +++ b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.html @@ -57,6 +57,15 @@ +
+ + +
+
{{ reason }}
+
+ +
+
Note diff --git a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.ts b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.ts index d9cb19845f0..c12d0065d31 100644 --- a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.ts +++ b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.ts @@ -1,7 +1,8 @@ import { Component, Input } from '@angular/core' -import { Account } from '@app/shared/account/account.model' import { Actor } from '@app/shared/actor/actor.model' +import { VideoAbusePredefinedReasons } from '../../../../../../shared/models/videos/abuse/video-abuse-reason.model' import { ProcessedVideoAbuse } from './video-abuse-list.component' +import { I18n } from '@ngx-translate/i18n-polyfill' @Component({ selector: 'my-video-abuse-details', @@ -11,6 +12,27 @@ import { ProcessedVideoAbuse } from './video-abuse-list.component' export class VideoAbuseDetailsComponent { @Input() videoAbuse: ProcessedVideoAbuse + private predefinedReasonsTranslations: { [key: number]: string } + + constructor ( + private i18n: I18n + ) { + this.predefinedReasonsTranslations = { + [VideoAbusePredefinedReasons.VIOLENT_OR_REPULSIVE]: this.i18n('Violent or Repulsive'), + [VideoAbusePredefinedReasons.HATEFUL_OR_ABUSIVE]: this.i18n('Hateful or Abusive'), + [VideoAbusePredefinedReasons.SPAM_OR_MISLEADING]: this.i18n('Spam or Misleading'), + [VideoAbusePredefinedReasons.PRIVACY]: this.i18n('Privacy'), + [VideoAbusePredefinedReasons.RIGHTS]: this.i18n('Rights'), + [VideoAbusePredefinedReasons.SERVER_RULES]: this.i18n('Server rules'), + [VideoAbusePredefinedReasons.THUMBNAILS]: this.i18n('Thumbnails'), + [VideoAbusePredefinedReasons.CAPTIONS]: this.i18n('Captions') + } + } + + get predefinedReasons () { + return this.videoAbuse.predefinedReasons.map(r => this.predefinedReasonsTranslations[r]) + } + switchToDefaultAvatar ($event: Event) { ($event.target as HTMLImageElement).src = Actor.GET_DEFAULT_AVATAR_URL() } diff --git a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts index a36acc2abda..86ad40dee90 100644 --- a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts +++ b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts @@ -11,13 +11,13 @@ import { ModerationCommentModalComponent } from './moderation-comment-modal.comp import { Video } from '../../../shared/video/video.model' import { MarkdownService } from '@app/shared/renderer' import { Actor } from '@app/shared/actor/actor.model' -import { buildVideoLink, buildVideoEmbed } from 'src/assets/player/utils' -import { getAbsoluteAPIUrl } from '@app/shared/misc/utils' +import { buildVideoEmbed } from 'src/assets/player/utils' import { DomSanitizer } from '@angular/platform-browser' import { BlocklistService } from '@app/shared/blocklist' import { VideoService } from '@app/shared/video/video.service' import { ActivatedRoute, Params, Router } from '@angular/router' import { filter } from 'rxjs/operators' +import { environment } from 'src/environments/environment' export type ProcessedVideoAbuse = VideoAbuse & { moderationCommentHtml?: string, @@ -259,12 +259,7 @@ export class VideoAbuseListComponent extends RestTable implements OnInit, AfterV } getVideoEmbed (videoAbuse: VideoAbuse) { - const absoluteAPIUrl = getAbsoluteAPIUrl() - const embedUrl = buildVideoLink({ - baseUrl: absoluteAPIUrl + '/videos/embed/' + videoAbuse.video.uuid, - warningTitle: false - }) - return buildVideoEmbed(embedUrl) + return buildVideoEmbed(`${environment.embedUrl}/videos/embed/${videoAbuse.video.uuid}`) } switchToDefaultAvatar ($event: Event) { diff --git a/client/src/app/shared/video-abuse/index.ts b/client/src/app/shared/video-abuse/index.ts index 92cbfb5f904..0c3a48d83b7 100644 --- a/client/src/app/shared/video-abuse/index.ts +++ b/client/src/app/shared/video-abuse/index.ts @@ -1 +1,2 @@ export * from './video-abuse.service' +export * from './video-abuse-predefined-reasons.model' diff --git a/client/src/app/shared/video-abuse/video-abuse-predefined-reasons.model.ts b/client/src/app/shared/video-abuse/video-abuse-predefined-reasons.model.ts new file mode 100644 index 00000000000..5969f48cea8 --- /dev/null +++ b/client/src/app/shared/video-abuse/video-abuse-predefined-reasons.model.ts @@ -0,0 +1,14 @@ +export enum PredefinedReasons { + violentOrRepulsive = 'violentOrRepulsive', + hatefulOrAbusive = 'hatefulOrAbusive', + spamOrMisleading = 'spamOrMisleading', + privacy = 'privacy', + rights = 'rights', + serverRules = 'serverRules', + thumbnails = 'thumbnails', + captions = 'captions' +} + +export type VideoAbusePredefinedReasons = { + [key in PredefinedReasons]?: boolean +} diff --git a/client/src/app/shared/video-abuse/video-abuse.service.ts b/client/src/app/shared/video-abuse/video-abuse.service.ts index 700a3023965..a8f31a96597 100644 --- a/client/src/app/shared/video-abuse/video-abuse.service.ts +++ b/client/src/app/shared/video-abuse/video-abuse.service.ts @@ -6,6 +6,7 @@ import { Observable } from 'rxjs' import { ResultList, VideoAbuse, VideoAbuseUpdate, VideoAbuseState } from '../../../../../shared' import { environment } from '../../../environments/environment' import { RestExtractor, RestPagination, RestService } from '../rest' +import { VideoAbusePredefinedReasons } from './video-abuse-predefined-reasons.model' @Injectable() export class VideoAbuseService { @@ -63,9 +64,11 @@ export class VideoAbuseService { ) } - reportVideo (id: number, reason: string) { - const url = VideoAbuseService.BASE_VIDEO_ABUSE_URL + id + '/abuse' - const body = { reason } + reportVideo (parameters: { id: number, reason: string, predefinedReasons?: VideoAbusePredefinedReasons, timestamp: any }) { + const url = VideoAbuseService.BASE_VIDEO_ABUSE_URL + parameters.id + '/abuse' + + delete parameters.id + const body = { ...parameters } return this.authHttp.post(url, body) .pipe( diff --git a/client/src/app/shared/video/modals/video-block.component.html b/client/src/app/shared/video/modals/video-block.component.html index a8dd30b5ea1..5e73d66c501 100644 --- a/client/src/app/shared/video/modals/video-block.component.html +++ b/client/src/app/shared/video/modals/video-block.component.html @@ -1,6 +1,6 @@
-

Blocklist video

+

Block video "{{ video.name }}"

@@ -9,7 +9,7 @@

Blocklist video

diff --git a/client/src/app/shared/video/modals/video-report.component.html b/client/src/app/shared/video/modals/video-report.component.html index e336b666038..d6beb6d2ad6 100644 --- a/client/src/app/shared/video/modals/video-report.component.html +++ b/client/src/app/shared/video/modals/video-report.component.html @@ -1,38 +1,97 @@
-

Report video

+

Report video "{{ video.name }}"

+ -
- Your report will be sent to moderators of {{ currentHost }} and will be forwarded to the video origin ({{ originHost }}) too. -
+
+
+ + + +
+ +
+ + +
+ + +
+ + +
+ +
- -
- -
- {{ formErrors.reason }} -
-
- +
+
+
+
+
+
+
+
+ +
+ + + + +
+ +
+ - + + +
+ +
+ Your report will be sent to moderators of {{ currentHost }} and will be forwarded to the video origin ({{ originHost }}) too. +
+ +
+ +
+ {{ formErrors.reason }} +
+
- +
+
+ + +
+ +
diff --git a/client/src/app/shared/video/modals/video-report.component.scss b/client/src/app/shared/video/modals/video-report.component.scss index 4713660a226..b2606cbd825 100644 --- a/client/src/app/shared/video/modals/video-report.component.scss +++ b/client/src/app/shared/video/modals/video-report.component.scss @@ -8,3 +8,20 @@ textarea { @include peertube-textarea(100%, 100px); } + +.start-at, +.stop-at { + width: 300px; + display: flex; + align-items: center; + + my-timestamp-input { + margin-left: 10px; + } +} + +.screenratio { + @include large-screen-ratio($selector: 'div, ::ng-deep iframe') { + left: 0; + }; +} diff --git a/client/src/app/shared/video/modals/video-report.component.ts b/client/src/app/shared/video/modals/video-report.component.ts index 988fa03d474..f32ce17f13b 100644 --- a/client/src/app/shared/video/modals/video-report.component.ts +++ b/client/src/app/shared/video/modals/video-report.component.ts @@ -6,8 +6,10 @@ import { FormValidatorService } from '@app/shared/forms/form-validators/form-val import { VideoAbuseValidatorsService } from '@app/shared/forms/form-validators/video-abuse-validators.service' import { NgbModal } from '@ng-bootstrap/ng-bootstrap' import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap/modal/modal-ref' -import { VideoAbuseService } from '@app/shared/video-abuse' +import { VideoAbuseService, VideoAbusePredefinedReasons, PredefinedReasons } from '@app/shared/video-abuse' import { Video } from '@app/shared/video/video.model' +import { buildVideoEmbed } from 'src/assets/player/utils' +import { DomSanitizer, SafeHtml } from '@angular/platform-browser' @Component({ selector: 'my-video-report', @@ -20,15 +22,19 @@ export class VideoReportComponent extends FormReactive implements OnInit { @ViewChild('modal', { static: true }) modal: NgbModal error: string = null + predefinedReasons: { id: PredefinedReasons, label: string, description?: string, help?: string }[] = [] private openedModal: NgbModalRef + embedHtml: SafeHtml + constructor ( protected formValidatorService: FormValidatorService, private modalService: NgbModal, private videoAbuseValidatorsService: VideoAbuseValidatorsService, private videoAbuseService: VideoAbuseService, private notifier: Notifier, + private sanitizer: DomSanitizer, private i18n: I18n ) { super() @@ -46,14 +52,87 @@ export class VideoReportComponent extends FormReactive implements OnInit { return '' } + get timestamp () { + return this.form.get('timestamp').value + } + + getVideoEmbed () { + return this.sanitizer.bypassSecurityTrustHtml( + buildVideoEmbed(this.video.embedUrl) + ) + } + ngOnInit () { + const predefinedReasons: Required = { + violentOrRepulsive: null, + hatefulOrAbusive: null, + spamOrMisleading: null, + privacy: null, + rights: null, + serverRules: null, + captions: null, + thumbnails: null + } + this.buildForm({ - reason: this.videoAbuseValidatorsService.VIDEO_ABUSE_REASON + reason: this.videoAbuseValidatorsService.VIDEO_ABUSE_REASON, + predefinedReasons: predefinedReasons as {[key: string]: null}, + timestamp: { + hasStart: null, + startAt: null, + hasEnd: null, + endAt: null + } }) + + this.predefinedReasons = [ + { + id: PredefinedReasons.violentOrRepulsive, + label: this.i18n('Violent or repulsive'), + help: this.i18n('Contains offensive, violent, or coarse language or iconography.') + }, + { + id: PredefinedReasons.hatefulOrAbusive, + label: this.i18n('Hateful or abusive'), + help: this.i18n('Contains abusive, racist or sexist language or iconography.') + }, + { + id: PredefinedReasons.spamOrMisleading, + label: this.i18n('Spam, ad or false news'), + help: this.i18n('Contains marketing, spam, purposefully deceitful news, or otherwise misleading thumbnail/text/tags. Please provide reputable sources to report hoaxes.') + }, + { + id: PredefinedReasons.privacy, + label: this.i18n('Privacy breach or doxxing'), + help: this.i18n('Contains personal information that could be used to track, identify, contact or impersonate someone (e.g. name, address, phone number, email, or credit card details).') + }, + { + id: PredefinedReasons.rights, + label: this.i18n('Intellectual property violation'), + help: this.i18n('Infringes my intellectual property or copyright, wrt. the regional rules with which the server must comply.') + }, + { + id: PredefinedReasons.serverRules, + label: this.i18n('Breaks server rules'), + description: this.i18n('Anything not included in the above that breaks the terms of service, code of conduct, or general rules in place on the server.') + }, + { + id: PredefinedReasons.thumbnails, + label: this.i18n('Thumbnails'), + help: this.i18n('The above can only be seen in thumbnails.') + }, + { + id: PredefinedReasons.captions, + label: this.i18n('Captions'), + help: this.i18n('The above can only be seen in captions (please describe which).') + } + ] + + this.embedHtml = this.getVideoEmbed() } show () { - this.openedModal = this.modalService.open(this.modal, { centered: true, keyboard: false }) + this.openedModal = this.modalService.open(this.modal, { centered: true, keyboard: false, size: 'lg' }) } hide () { @@ -62,9 +141,7 @@ export class VideoReportComponent extends FormReactive implements OnInit { } report () { - const reason = this.form.value['reason'] - - this.videoAbuseService.reportVideo(this.video.id, reason) + this.videoAbuseService.reportVideo({ id: this.video.id, ...this.form.value }) .subscribe( () => { this.notifier.success(this.i18n('Video reported.')) diff --git a/client/src/app/shared/video/video.model.ts b/client/src/app/shared/video/video.model.ts index 16e43cbd823..dc5f4562674 100644 --- a/client/src/app/shared/video/video.model.ts +++ b/client/src/app/shared/video/video.model.ts @@ -7,6 +7,7 @@ import { peertubeTranslate, ServerConfig } from '../../../../../shared/models' import { Actor } from '@app/shared/actor/actor.model' import { VideoScheduleUpdate } from '../../../../../shared/models/videos/video-schedule-update.model' import { AuthUser } from '@app/core' +import { environment } from '../../../environments/environment' export class Video implements VideoServerModel { byVideoChannel: string @@ -111,7 +112,7 @@ export class Video implements VideoServerModel { this.previewUrl = hash.previewUrl || (absoluteAPIUrl + hash.previewPath) this.embedPath = hash.embedPath - this.embedUrl = hash.embedUrl || (absoluteAPIUrl + hash.embedPath) + this.embedUrl = hash.embedUrl || (environment.embedUrl + hash.embedPath) this.url = hash.url diff --git a/client/src/environments/environment.e2e.ts b/client/src/environments/environment.e2e.ts index 7c00e8d4f9b..7724d27c929 100644 --- a/client/src/environments/environment.e2e.ts +++ b/client/src/environments/environment.e2e.ts @@ -1,5 +1,6 @@ export const environment = { production: false, hmr: false, - apiUrl: 'http://localhost:9001' + apiUrl: 'http://localhost:9001', + embedUrl: 'http://localhost:9001/videos/embed' } diff --git a/client/src/environments/environment.hmr.ts b/client/src/environments/environment.hmr.ts index 853e2080386..72eed45e5e6 100644 --- a/client/src/environments/environment.hmr.ts +++ b/client/src/environments/environment.hmr.ts @@ -1,5 +1,6 @@ export const environment = { production: false, hmr: true, - apiUrl: '' + apiUrl: '', + embedUrl: 'http://localhost:9000/videos/embed' } diff --git a/client/src/environments/environment.prod.ts b/client/src/environments/environment.prod.ts index d5dfe55736a..368aa138990 100644 --- a/client/src/environments/environment.prod.ts +++ b/client/src/environments/environment.prod.ts @@ -1,5 +1,6 @@ export const environment = { production: true, hmr: false, - apiUrl: '' + apiUrl: '', + embedUrl: '/videos/embed' } diff --git a/client/src/environments/environment.ts b/client/src/environments/environment.ts index b6bc784b53c..60f5d945098 100644 --- a/client/src/environments/environment.ts +++ b/client/src/environments/environment.ts @@ -11,5 +11,6 @@ import 'core-js/features/reflect' export const environment = { production: false, hmr: false, - apiUrl: 'http://localhost:9000' + apiUrl: 'http://localhost:9000', + embedUrl: 'http://localhost:9000/videos/embed' } diff --git a/client/src/sass/player/peertube-skin.scss b/client/src/sass/player/peertube-skin.scss index 1fc744e674a..bdeff8f9a45 100644 --- a/client/src/sass/player/peertube-skin.scss +++ b/client/src/sass/player/peertube-skin.scss @@ -86,7 +86,7 @@ body { } &.focus-visible, &:hover { - background-color: var(--mainColor); + background-color: var(--mainColor, dimgray); } } diff --git a/server/controllers/api/videos/abuse.ts b/server/controllers/api/videos/abuse.ts index 77843f149d9..d95afa5c589 100644 --- a/server/controllers/api/videos/abuse.ts +++ b/server/controllers/api/videos/abuse.ts @@ -25,6 +25,9 @@ import { sendVideoAbuse } from '../../../lib/activitypub/send/send-flag' import { MVideoAbuseAccountVideo } from '../../../types/models/video' import { getServerActor } from '@server/models/application/application' import { MAccountDefault } from '@server/types/models' +import { keys, pickBy } from 'lodash' +import { AbuseReasonModel } from '@server/models/video/abuse-reason' +import { VideoAbusePredefinedReasonsIn } from '@shared/models/videos/abuse/video-abuse-reason.model' const auditLogger = auditLoggerFactory('abuse') const abuseVideoRouter = express.Router() @@ -123,18 +126,34 @@ async function reportVideoAbuse (req: express.Request, res: express.Response) { const videoAbuseInstance = await sequelizeTypescript.transaction(async t => { reporterAccount = await AccountModel.load(res.locals.oauth.token.User.Account.id, t) + const predefinedReasons = keys(pickBy(body.predefinedReasons)).map(r => VideoAbusePredefinedReasonsIn[r]) + const timestamp = body.timestamp + const startAt = timestamp['hasStart'] && timestamp['startAt'] ? timestamp['startAt'] : undefined + const endAt = timestamp['hasEnd'] && timestamp['endAt'] ? timestamp['endAt'] : undefined const abuseToCreate = { reporterAccountId: reporterAccount.id, reason: body.reason, videoId: videoInstance.id, - state: VideoAbuseState.PENDING + state: VideoAbuseState.PENDING, + startAt, + endAt } const videoAbuseInstance: MVideoAbuseAccountVideo = await VideoAbuseModel.create(abuseToCreate, { transaction: t }) videoAbuseInstance.Video = videoInstance videoAbuseInstance.Account = reporterAccount + // Add eventual predefined reasons + if (predefinedReasons.length > 0) { + const reasons = [] + for (const reasonId of predefinedReasons) { + reasons.push(await AbuseReasonModel.findByPk(reasonId + 1, { transaction: t })) + } + await videoAbuseInstance.$set('PredefinedReasons', reasons, { transaction: t }) + videoAbuseInstance.PredefinedReasons = reasons + } + // We send the video abuse to the origin server if (videoInstance.isOwned() === false) { await sendVideoAbuse(reporterAccount.Actor, videoAbuseInstance, videoInstance, t) @@ -152,7 +171,7 @@ async function reportVideoAbuse (req: express.Request, res: express.Response) { reporter: reporterAccount.Actor.getIdentifier() }) - logger.info('Abuse report for video %s created.', videoInstance.name) + logger.info('Abuse report for video "%s" created.', videoInstance.name) return res.json({ videoAbuse: videoAbuseJSON }).end() } diff --git a/server/helpers/custom-validators/video-abuses.ts b/server/helpers/custom-validators/video-abuses.ts index 05e11b1c69c..67265493054 100644 --- a/server/helpers/custom-validators/video-abuses.ts +++ b/server/helpers/custom-validators/video-abuses.ts @@ -10,6 +10,14 @@ function isVideoAbuseReasonValid (value: string) { return exists(value) && validator.isLength(value, VIDEO_ABUSES_CONSTRAINTS_FIELDS.REASON) } +function isVideoAbusePredefinedReasonsValid (value: {}) { + return exists(value) +} + +function isVideoAbuseTimestampValid (value: {}) { + return exists(value) +} + function isVideoAbuseModerationCommentValid (value: string) { return exists(value) && validator.isLength(value, VIDEO_ABUSES_CONSTRAINTS_FIELDS.MODERATION_COMMENT) } @@ -28,8 +36,10 @@ function isAbuseVideoIsValid (value: VideoAbuseVideoIs) { // --------------------------------------------------------------------------- export { - isVideoAbuseStateValid, isVideoAbuseReasonValid, - isAbuseVideoIsValid, - isVideoAbuseModerationCommentValid + isVideoAbusePredefinedReasonsValid, + isVideoAbuseTimestampValid, + isVideoAbuseModerationCommentValid, + isVideoAbuseStateValid, + isAbuseVideoIsValid } diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts index 314f094b3ac..7f8f87d6d48 100644 --- a/server/initializers/constants.ts +++ b/server/initializers/constants.ts @@ -14,7 +14,7 @@ import { CONFIG, registerConfigChangedHandler } from './config' // --------------------------------------------------------------------------- -const LAST_MIGRATION_VERSION = 510 +const LAST_MIGRATION_VERSION = 520 // --------------------------------------------------------------------------- diff --git a/server/initializers/database.ts b/server/initializers/database.ts index 633d4f95645..02d228b4b7b 100644 --- a/server/initializers/database.ts +++ b/server/initializers/database.ts @@ -39,6 +39,8 @@ import { VideoPlaylistElementModel } from '../models/video/video-playlist-elemen import { ThumbnailModel } from '../models/video/thumbnail' import { PluginModel } from '../models/server/plugin' import { QueryTypes, Transaction } from 'sequelize' +import { VideoAbuseReasonModel } from '@server/models/video/video-abuse-reason' +import { AbuseReasonModel } from '@server/models/video/abuse-reason' require('pg').defaults.parseInt8 = true // Avoid BIGINT to be converted to string @@ -109,7 +111,9 @@ async function initDatabaseModels (silent: boolean) { VideoPlaylistModel, VideoPlaylistElementModel, ThumbnailModel, - PluginModel + PluginModel, + VideoAbuseReasonModel, + AbuseReasonModel ]) // Check extensions exist in the database diff --git a/server/initializers/migrations/0515-video-abuse-reason.ts b/server/initializers/migrations/0515-video-abuse-reason.ts new file mode 100644 index 00000000000..c292673d88b --- /dev/null +++ b/server/initializers/migrations/0515-video-abuse-reason.ts @@ -0,0 +1,28 @@ +import * as Sequelize from 'sequelize' +import { VideoAbusePredefinedReasons } from '../../../shared/models/videos' + +async function up (utils: { + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface + sequelize: Sequelize.Sequelize +}): Promise { + await utils.queryInterface.bulkInsert('abuseReason', [ + { predefinedReasonId: VideoAbusePredefinedReasons.VIOLENT_OR_REPULSIVE }, + { predefinedReasonId: VideoAbusePredefinedReasons.HATEFUL_OR_ABUSIVE }, + { predefinedReasonId: VideoAbusePredefinedReasons.SPAM_OR_MISLEADING }, + { predefinedReasonId: VideoAbusePredefinedReasons.PRIVACY }, + { predefinedReasonId: VideoAbusePredefinedReasons.RIGHTS }, + { predefinedReasonId: VideoAbusePredefinedReasons.SERVER_RULES }, + { predefinedReasonId: VideoAbusePredefinedReasons.THUMBNAILS }, + { predefinedReasonId: VideoAbusePredefinedReasons.CAPTIONS } + ]) +} + +function down (options) { + throw new Error('Not implemented.') +} + +export { + up, + down +} diff --git a/server/initializers/migrations/0520-video-abuse-timestamp.ts b/server/initializers/migrations/0520-video-abuse-timestamp.ts new file mode 100644 index 00000000000..0cf72ed10d9 --- /dev/null +++ b/server/initializers/migrations/0520-video-abuse-timestamp.ts @@ -0,0 +1,28 @@ +import * as Sequelize from 'sequelize' + +async function up (utils: { + transaction: Sequelize.Transaction + queryInterface: Sequelize.QueryInterface + sequelize: Sequelize.Sequelize +}): Promise { + + await utils.queryInterface.addColumn('videoAbuse', 'startAt', { + type: Sequelize.INTEGER, + allowNull: true + }) + + await utils.queryInterface.addColumn('videoAbuse', 'endAt', { + type: Sequelize.INTEGER, + allowNull: true + }) + +} + +function down (options) { + throw new Error('Not implemented.') +} + +export { + up, + down +} diff --git a/server/middlewares/validators/videos/video-abuses.ts b/server/middlewares/validators/videos/video-abuses.ts index 901997bcb2d..d82659f88ce 100644 --- a/server/middlewares/validators/videos/video-abuses.ts +++ b/server/middlewares/validators/videos/video-abuses.ts @@ -5,15 +5,31 @@ import { isAbuseVideoIsValid, isVideoAbuseModerationCommentValid, isVideoAbuseReasonValid, - isVideoAbuseStateValid + isVideoAbuseStateValid, + isVideoAbusePredefinedReasonsValid, + isVideoAbuseTimestampValid } from '../../../helpers/custom-validators/video-abuses' import { logger } from '../../../helpers/logger' import { doesVideoAbuseExist, doesVideoExist } from '../../../helpers/middlewares' import { areValidationErrors } from '../utils' const videoAbuseReportValidator = [ - param('videoId').custom(isIdOrUUIDValid).not().isEmpty().withMessage('Should have a valid videoId'), - body('reason').custom(isVideoAbuseReasonValid).withMessage('Should have a valid reason'), + param('videoId') + .custom(isIdOrUUIDValid) + .not() + .isEmpty() + .withMessage('Should have a valid videoId'), + body('reason') + .custom(isVideoAbuseReasonValid) + .withMessage('Should have a valid reason'), + body('predefinedReasons') + .optional() + .custom(isVideoAbusePredefinedReasonsValid) + .withMessage('Should have a valid list of predefined reasons'), + body('timestamp') + .optional() + .custom(isVideoAbuseTimestampValid) + .withMessage('Should have valid timestamp definition'), async (req: express.Request, res: express.Response, next: express.NextFunction) => { logger.debug('Checking videoAbuseReport parameters', { parameters: req.body }) diff --git a/server/models/video/abuse-reason.ts b/server/models/video/abuse-reason.ts new file mode 100644 index 00000000000..cff108549ab --- /dev/null +++ b/server/models/video/abuse-reason.ts @@ -0,0 +1,27 @@ +import { AllowNull, BelongsToMany, Column, Model, Table } from 'sequelize-typescript' +import { VideoAbuseModel } from './video-abuse' +import { VideoAbuseReasonModel } from './video-abuse-reason' + +@Table({ + tableName: 'abuseReason', + timestamps: false, + indexes: [ + { + fields: [ 'predefinedReasonId' ], + unique: true + } + ] +}) +export class AbuseReasonModel extends Model { + + @AllowNull(false) + @Column + predefinedReasonId: number + + @BelongsToMany(() => VideoAbuseModel, { + foreignKey: 'abuseReasonId', + through: () => VideoAbuseReasonModel, + onDelete: 'CASCADE' + }) + Abuses: VideoAbuseModel[] +} diff --git a/server/models/video/video-abuse-reason.ts b/server/models/video/video-abuse-reason.ts new file mode 100644 index 00000000000..81dbebf8217 --- /dev/null +++ b/server/models/video/video-abuse-reason.ts @@ -0,0 +1,30 @@ +import { Column, CreatedAt, ForeignKey, Model, Table, UpdatedAt } from 'sequelize-typescript' +import { AbuseReasonModel } from './abuse-reason' +import { VideoAbuseModel } from './video-abuse' + +@Table({ + tableName: 'videoAbuseReason', + indexes: [ + { + fields: [ 'videoAbuseId' ] + }, + { + fields: [ 'abuseReasonId' ] + } + ] +}) +export class VideoAbuseReasonModel extends Model { + @CreatedAt + createdAt: Date + + @UpdatedAt + updatedAt: Date + + @ForeignKey(() => VideoAbuseModel) + @Column + videoAbuseId: number + + @ForeignKey(() => AbuseReasonModel) + @Column + abuseReasonId: number +} diff --git a/server/models/video/video-abuse.ts b/server/models/video/video-abuse.ts index b2f11133726..c02277661ca 100644 --- a/server/models/video/video-abuse.ts +++ b/server/models/video/video-abuse.ts @@ -12,7 +12,8 @@ import { Model, Scopes, Table, - UpdatedAt + UpdatedAt, + BelongsToMany } from 'sequelize-typescript' import { VideoAbuseVideoIs } from '@shared/models/videos/abuse/video-abuse-video-is.type' import { VideoAbuseState, VideoDetails } from '../../../shared' @@ -31,9 +32,12 @@ import { ThumbnailModel } from './thumbnail' import { VideoModel } from './video' import { VideoBlacklistModel } from './video-blacklist' import { ScopeNames as VideoChannelScopeNames, SummaryOptions, VideoChannelModel } from './video-channel' +import { AbuseReasonModel } from './abuse-reason' +import { VideoAbuseReasonModel } from './video-abuse-reason' export enum ScopeNames { - FOR_API = 'FOR_API' + FOR_API = 'FOR_API', + WITH_ABUSE_REASON = 'WITH_ABUSE_REASON' } @Scopes(() => ({ @@ -220,6 +224,9 @@ export enum ScopeNames { ], where } + }, + [ScopeNames.WITH_ABUSE_REASON]: { + include: [ AbuseReasonModel ] } })) @Table({ @@ -258,6 +265,16 @@ export class VideoAbuseModel extends Model { @Column(DataType.JSONB) deletedVideo: VideoDetails + @AllowNull(true) + @Default(null) + @Column + startAt: number + + @AllowNull(true) + @Default(null) + @Column + endAt: number + @CreatedAt createdAt: Date @@ -288,6 +305,13 @@ export class VideoAbuseModel extends Model { }) Video: VideoModel + @BelongsToMany(() => AbuseReasonModel, { + foreignKey: 'videoAbuseId', + through: () => VideoAbuseReasonModel, + onDelete: 'CASCADE' + }) + PredefinedReasons: AbuseReasonModel[] + static loadByIdAndVideoId (id: number, videoId?: number, uuid?: string): Bluebird { const videoAttributes = {} if (videoId) videoAttributes['videoId'] = videoId @@ -360,7 +384,10 @@ export class VideoAbuseModel extends Model { } return VideoAbuseModel - .scope({ method: [ ScopeNames.FOR_API, filters ] }) + .scope([ + { method: [ ScopeNames.FOR_API, filters ] }, + 'WITH_ABUSE_REASON' + ]) .findAndCountAll(query) .then(({ rows, count }) => { return { total: count, data: rows } @@ -368,6 +395,7 @@ export class VideoAbuseModel extends Model { } toFormattedJSON (this: MVideoAbuseFormattable): VideoAbuse { + const predefinedReasons = this.PredefinedReasons || [] const countReportsForVideo = this.get('countReportsForVideo') as number const nthReportForVideo = this.get('nthReportForVideo') as number const countReportsForReporterVideo = this.get('countReportsForReporter__video') as number @@ -382,6 +410,7 @@ export class VideoAbuseModel extends Model { return { id: this.id, reason: this.reason, + predefinedReasons: predefinedReasons.map(r => r.predefinedReasonId), reporterAccount: this.Account.toFormattedJSON(), state: { id: this.state, @@ -400,6 +429,8 @@ export class VideoAbuseModel extends Model { }, createdAt: this.createdAt, updatedAt: this.updatedAt, + startAt: this.startAt, + endAt: this.endAt, count: countReportsForVideo || 0, nth: nthReportForVideo || 0, countReportsForReporter: (countReportsForReporterVideo || 0) + (countReportsForReporterDeletedVideo || 0), diff --git a/shared/models/videos/abuse/video-abuse-create.model.ts b/shared/models/videos/abuse/video-abuse-create.model.ts index db64582755f..b2cc2da0b9f 100644 --- a/shared/models/videos/abuse/video-abuse-create.model.ts +++ b/shared/models/videos/abuse/video-abuse-create.model.ts @@ -1,3 +1,5 @@ export interface VideoAbuseCreate { reason: string + predefinedReasons: any + timestamp: any } diff --git a/shared/models/videos/abuse/video-abuse-reason.model.ts b/shared/models/videos/abuse/video-abuse-reason.model.ts new file mode 100644 index 00000000000..62487171140 --- /dev/null +++ b/shared/models/videos/abuse/video-abuse-reason.model.ts @@ -0,0 +1,21 @@ +export enum VideoAbusePredefinedReasons { + VIOLENT_OR_REPULSIVE, + HATEFUL_OR_ABUSIVE, + SPAM_OR_MISLEADING, + PRIVACY, + RIGHTS, + SERVER_RULES, + THUMBNAILS, + CAPTIONS +} + +export const VideoAbusePredefinedReasonsIn = { + violentOrRepulsive: VideoAbusePredefinedReasons.VIOLENT_OR_REPULSIVE, + hatefulOrAbusive: VideoAbusePredefinedReasons.HATEFUL_OR_ABUSIVE, + spamOrMisleading: VideoAbusePredefinedReasons.SPAM_OR_MISLEADING, + privacy: VideoAbusePredefinedReasons.PRIVACY, + rights: VideoAbusePredefinedReasons.RIGHTS, + serverRules: VideoAbusePredefinedReasons.SERVER_RULES, + thumbnails: VideoAbusePredefinedReasons.THUMBNAILS, + captions: VideoAbusePredefinedReasons.CAPTIONS +} diff --git a/shared/models/videos/abuse/video-abuse.model.ts b/shared/models/videos/abuse/video-abuse.model.ts index f2c2cdc415d..e948859771e 100644 --- a/shared/models/videos/abuse/video-abuse.model.ts +++ b/shared/models/videos/abuse/video-abuse.model.ts @@ -6,6 +6,7 @@ import { VideoChannel } from '../channel/video-channel.model' export interface VideoAbuse { id: number reason: string + predefinedReasons?: number[] reporterAccount: Account state: VideoConstant @@ -25,6 +26,9 @@ export interface VideoAbuse { createdAt: Date updatedAt: Date + startAt: number + endAt: number + count?: number nth?: number diff --git a/shared/models/videos/index.ts b/shared/models/videos/index.ts index 51ccb9fbd0e..58bd1ebd7df 100644 --- a/shared/models/videos/index.ts +++ b/shared/models/videos/index.ts @@ -4,6 +4,7 @@ export * from './rate/account-video-rate.model' export * from './rate/user-video-rate.type' export * from './abuse/video-abuse-state.model' export * from './abuse/video-abuse-create.model' +export * from './abuse/video-abuse-reason.model' export * from './abuse/video-abuse.model' export * from './abuse/video-abuse-update.model' export * from './blacklist/video-blacklist.model' From 1f2b49775ca048d1560c173aa4932fc36910cf1a Mon Sep 17 00:00:00 2001 From: Rigel Kent Date: Sat, 13 Jun 2020 18:44:32 +0200 Subject: [PATCH 2/9] adding federation for abuse predefined reasons and start/end --- server/lib/activitypub/process/process-flag.ts | 18 +++++++++++++++++- server/models/video/video-abuse.ts | 12 +++++++++++- shared/models/activitypub/activity.ts | 5 ++++- .../activitypub/objects/common-objects.ts | 6 ++++++ .../activitypub/objects/video-abuse-object.ts | 5 +++++ 5 files changed, 43 insertions(+), 3 deletions(-) diff --git a/server/lib/activitypub/process/process-flag.ts b/server/lib/activitypub/process/process-flag.ts index 8d1c9c869e9..d6ea356434c 100644 --- a/server/lib/activitypub/process/process-flag.ts +++ b/server/lib/activitypub/process/process-flag.ts @@ -10,6 +10,7 @@ import { getAPId } from '../../../helpers/activitypub' import { APProcessorOptions } from '../../../types/activitypub-processor.model' import { MActorSignature, MVideoAbuseAccountVideo } from '../../../types/models' import { AccountModel } from '@server/models/account/account' +import { AbuseReasonModel } from '@server/models/video/abuse-reason' async function processFlagActivity (options: APProcessorOptions) { const { activity, byActor } = options @@ -38,19 +39,34 @@ async function processCreateVideoAbuse (activity: ActivityCreate | ActivityFlag, const { video } = await getOrCreateVideoAndAccountAndChannel({ videoObject: object }) const reporterAccount = await sequelizeTypescript.transaction(async t => AccountModel.load(account.id, t)) + const predefinedReasons = flag.tag?.map(tag => parseInt(tag.name, 10)) + const startAt = flag.startTime ? parseInt(flag.startTime, 10) : undefined + const endAt = flag.endTime ? parseInt(flag.endTime, 10) : undefined const videoAbuseInstance = await sequelizeTypescript.transaction(async t => { const videoAbuseData = { reporterAccountId: account.id, reason: flag.content, videoId: video.id, - state: VideoAbuseState.PENDING + state: VideoAbuseState.PENDING, + startAt, + endAt } const videoAbuseInstance: MVideoAbuseAccountVideo = await VideoAbuseModel.create(videoAbuseData, { transaction: t }) videoAbuseInstance.Video = video videoAbuseInstance.Account = reporterAccount + // Add eventual predefined reasons + if (predefinedReasons.length > 0) { + const reasons = [] + for (const reasonId of predefinedReasons) { + reasons.push(await AbuseReasonModel.findByPk(reasonId + 1, { transaction: t })) + } + await videoAbuseInstance.$set('PredefinedReasons', reasons, { transaction: t }) + videoAbuseInstance.PredefinedReasons = reasons + } + logger.info('Remote abuse for video uuid %s created', flag.object) return videoAbuseInstance diff --git a/server/models/video/video-abuse.ts b/server/models/video/video-abuse.ts index c02277661ca..bc5f607aee1 100644 --- a/server/models/video/video-abuse.ts +++ b/server/models/video/video-abuse.ts @@ -439,10 +439,20 @@ export class VideoAbuseModel extends Model { } toActivityPubObject (this: MVideoAbuseVideo): VideoAbuseObject { + const predefinedReasons = this.PredefinedReasons || [] + const startTime = this.startAt?.toString() + const endTime = this.endAt?.toString() + return { type: 'Flag' as 'Flag', content: this.reason, - object: this.Video.url + object: this.Video.url, + tag: predefinedReasons.map(r => ({ + type: 'Hashtag' as 'Hashtag', + name: r.predefinedReasonId.toString() + })), + startTime, + endTime } } diff --git a/shared/models/activitypub/activity.ts b/shared/models/activitypub/activity.ts index 20ecf176c60..385a4b943e6 100644 --- a/shared/models/activitypub/activity.ts +++ b/shared/models/activitypub/activity.ts @@ -1,6 +1,6 @@ import { ActivityPubActor } from './activitypub-actor' import { ActivityPubSignature } from './activitypub-signature' -import { CacheFileObject, VideoTorrentObject } from './objects' +import { CacheFileObject, VideoTorrentObject, ActivityFlagReasonObject } from './objects' import { DislikeObject } from './objects/dislike-object' import { VideoAbuseObject } from './objects/video-abuse-object' import { VideoCommentObject } from './objects/video-comment-object' @@ -113,4 +113,7 @@ export interface ActivityFlag extends BaseActivity { type: 'Flag' content: string object: APObject | APObject[] + tag?: ActivityFlagReasonObject[] + startTime?: string + endTime?: string } diff --git a/shared/models/activitypub/objects/common-objects.ts b/shared/models/activitypub/objects/common-objects.ts index bb3ffe6785e..3c2bc3f35b8 100644 --- a/shared/models/activitypub/objects/common-objects.ts +++ b/shared/models/activitypub/objects/common-objects.ts @@ -81,6 +81,12 @@ export interface ActivityMentionObject { name: string } +export interface ActivityFlagReasonObject { + type: 'Hashtag' | 'Mention' + href?: string + name: string +} + export type ActivityTagObject = ActivityPlaylistSegmentHashesObject | ActivityPlaylistInfohashesObject diff --git a/shared/models/activitypub/objects/video-abuse-object.ts b/shared/models/activitypub/objects/video-abuse-object.ts index d9622b41489..13b7b3c4310 100644 --- a/shared/models/activitypub/objects/video-abuse-object.ts +++ b/shared/models/activitypub/objects/video-abuse-object.ts @@ -1,5 +1,10 @@ +import { ActivityFlagReasonObject } from './common-objects' + export interface VideoAbuseObject { type: 'Flag' content: string object: string | string[] + tag?: ActivityFlagReasonObject[] + startTime?: string + endTime?: string } From 1d80b5ad9e7743cd0e3eec1d45f9cc6891e9ed61 Mon Sep 17 00:00:00 2001 From: Rigel Kent Date: Sat, 13 Jun 2020 21:57:07 +0200 Subject: [PATCH 3/9] switch to simpler array type, add front filters --- .../video-abuse-details.component.html | 6 +-- .../video-abuse-details.component.ts | 5 +- client/src/app/shared/rest/rest.service.ts | 4 +- .../shared/video-abuse/video-abuse.service.ts | 14 ++++- server/controllers/api/videos/abuse.ts | 13 +---- server/initializers/constants.ts | 2 +- server/initializers/database.ts | 6 +-- ... => 0515-video-abuse-reason-timestamps.ts} | 2 - .../migrations/0515-video-abuse-reason.ts | 28 ---------- .../lib/activitypub/process/process-flag.ts | 18 ++----- .../validators/videos/video-abuses.ts | 3 ++ server/models/video/abuse-reason.ts | 27 ---------- server/models/video/video-abuse-reason.ts | 30 ----------- server/models/video/video-abuse.ts | 54 +++++++++---------- shared/models/activitypub/activity.ts | 4 +- .../activitypub/objects/video-abuse-object.ts | 4 +- 16 files changed, 64 insertions(+), 156 deletions(-) rename server/initializers/migrations/{0520-video-abuse-timestamp.ts => 0515-video-abuse-reason-timestamps.ts} (99%) delete mode 100644 server/initializers/migrations/0515-video-abuse-reason.ts delete mode 100644 server/models/video/abuse-reason.ts delete mode 100644 server/models/video/video-abuse-reason.ts diff --git a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.html b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.html index a29fadca85c..90ce2523278 100644 --- a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.html +++ b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.html @@ -60,9 +60,9 @@
-
-
{{ reason }}
-
+ +
{{ reason.label }}
+
diff --git a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.ts b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.ts index c12d0065d31..1b84f1940ba 100644 --- a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.ts +++ b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.ts @@ -30,7 +30,10 @@ export class VideoAbuseDetailsComponent { } get predefinedReasons () { - return this.videoAbuse.predefinedReasons.map(r => this.predefinedReasonsTranslations[r]) + return this.videoAbuse.predefinedReasons.map(r => ({ + id: r, + label: this.predefinedReasonsTranslations[r] + })) } switchToDefaultAvatar ($event: Event) { diff --git a/client/src/app/shared/rest/rest.service.ts b/client/src/app/shared/rest/rest.service.ts index cd6db1f3c7d..bea329adcb0 100644 --- a/client/src/app/shared/rest/rest.service.ts +++ b/client/src/app/shared/rest/rest.service.ts @@ -46,7 +46,7 @@ export class RestService { addObjectParams (params: HttpParams, object: { [ name: string ]: any }) { for (const name of Object.keys(object)) { const value = object[name] - if (!value) continue + if (value === undefined || value === null) continue if (Array.isArray(value) && value.length !== 0) { for (const v of value) params = params.append(name, v) @@ -93,7 +93,7 @@ export class RestService { return t }) - .filter(t => !!t) + .filter(t => !!t || t === 0) if (matchedTokens.length === 0) continue diff --git a/client/src/app/shared/video-abuse/video-abuse.service.ts b/client/src/app/shared/video-abuse/video-abuse.service.ts index a8f31a96597..a1d1d9d4195 100644 --- a/client/src/app/shared/video-abuse/video-abuse.service.ts +++ b/client/src/app/shared/video-abuse/video-abuse.service.ts @@ -52,7 +52,19 @@ export class VideoAbuseService { } }, searchReporter: { prefix: 'reporter:' }, - searchReportee: { prefix: 'reportee:' } + searchReportee: { prefix: 'reportee:' }, + predefinedReasonId: { + prefix: 'tag:', + handler: v => { + console.log(v) + try { + const id = parseInt(v, 10) + return id + } catch { + return undefined + } + } + } }) params = this.restService.addObjectParams(params, filters) diff --git a/server/controllers/api/videos/abuse.ts b/server/controllers/api/videos/abuse.ts index d95afa5c589..4b3583fb514 100644 --- a/server/controllers/api/videos/abuse.ts +++ b/server/controllers/api/videos/abuse.ts @@ -26,7 +26,6 @@ import { MVideoAbuseAccountVideo } from '../../../types/models/video' import { getServerActor } from '@server/models/application/application' import { MAccountDefault } from '@server/types/models' import { keys, pickBy } from 'lodash' -import { AbuseReasonModel } from '@server/models/video/abuse-reason' import { VideoAbusePredefinedReasonsIn } from '@shared/models/videos/abuse/video-abuse-reason.model' const auditLogger = auditLoggerFactory('abuse') @@ -77,6 +76,7 @@ async function listVideoAbuses (req: express.Request, res: express.Response) { count: req.query.count, sort: req.query.sort, id: req.query.id, + predefinedReasonId: req.query.predefinedReasonId, search: req.query.search, state: req.query.state, videoIs: req.query.videoIs, @@ -136,6 +136,7 @@ async function reportVideoAbuse (req: express.Request, res: express.Response) { reason: body.reason, videoId: videoInstance.id, state: VideoAbuseState.PENDING, + predefinedReasons, startAt, endAt } @@ -144,16 +145,6 @@ async function reportVideoAbuse (req: express.Request, res: express.Response) { videoAbuseInstance.Video = videoInstance videoAbuseInstance.Account = reporterAccount - // Add eventual predefined reasons - if (predefinedReasons.length > 0) { - const reasons = [] - for (const reasonId of predefinedReasons) { - reasons.push(await AbuseReasonModel.findByPk(reasonId + 1, { transaction: t })) - } - await videoAbuseInstance.$set('PredefinedReasons', reasons, { transaction: t }) - videoAbuseInstance.PredefinedReasons = reasons - } - // We send the video abuse to the origin server if (videoInstance.isOwned() === false) { await sendVideoAbuse(reporterAccount.Actor, videoAbuseInstance, videoInstance, t) diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts index 7f8f87d6d48..dd79c0e168a 100644 --- a/server/initializers/constants.ts +++ b/server/initializers/constants.ts @@ -14,7 +14,7 @@ import { CONFIG, registerConfigChangedHandler } from './config' // --------------------------------------------------------------------------- -const LAST_MIGRATION_VERSION = 520 +const LAST_MIGRATION_VERSION = 515 // --------------------------------------------------------------------------- diff --git a/server/initializers/database.ts b/server/initializers/database.ts index 02d228b4b7b..633d4f95645 100644 --- a/server/initializers/database.ts +++ b/server/initializers/database.ts @@ -39,8 +39,6 @@ import { VideoPlaylistElementModel } from '../models/video/video-playlist-elemen import { ThumbnailModel } from '../models/video/thumbnail' import { PluginModel } from '../models/server/plugin' import { QueryTypes, Transaction } from 'sequelize' -import { VideoAbuseReasonModel } from '@server/models/video/video-abuse-reason' -import { AbuseReasonModel } from '@server/models/video/abuse-reason' require('pg').defaults.parseInt8 = true // Avoid BIGINT to be converted to string @@ -111,9 +109,7 @@ async function initDatabaseModels (silent: boolean) { VideoPlaylistModel, VideoPlaylistElementModel, ThumbnailModel, - PluginModel, - VideoAbuseReasonModel, - AbuseReasonModel + PluginModel ]) // Check extensions exist in the database diff --git a/server/initializers/migrations/0520-video-abuse-timestamp.ts b/server/initializers/migrations/0515-video-abuse-reason-timestamps.ts similarity index 99% rename from server/initializers/migrations/0520-video-abuse-timestamp.ts rename to server/initializers/migrations/0515-video-abuse-reason-timestamps.ts index 0cf72ed10d9..964a5f588b7 100644 --- a/server/initializers/migrations/0520-video-abuse-timestamp.ts +++ b/server/initializers/migrations/0515-video-abuse-reason-timestamps.ts @@ -5,7 +5,6 @@ async function up (utils: { queryInterface: Sequelize.QueryInterface sequelize: Sequelize.Sequelize }): Promise { - await utils.queryInterface.addColumn('videoAbuse', 'startAt', { type: Sequelize.INTEGER, allowNull: true @@ -15,7 +14,6 @@ async function up (utils: { type: Sequelize.INTEGER, allowNull: true }) - } function down (options) { diff --git a/server/initializers/migrations/0515-video-abuse-reason.ts b/server/initializers/migrations/0515-video-abuse-reason.ts deleted file mode 100644 index c292673d88b..00000000000 --- a/server/initializers/migrations/0515-video-abuse-reason.ts +++ /dev/null @@ -1,28 +0,0 @@ -import * as Sequelize from 'sequelize' -import { VideoAbusePredefinedReasons } from '../../../shared/models/videos' - -async function up (utils: { - transaction: Sequelize.Transaction - queryInterface: Sequelize.QueryInterface - sequelize: Sequelize.Sequelize -}): Promise { - await utils.queryInterface.bulkInsert('abuseReason', [ - { predefinedReasonId: VideoAbusePredefinedReasons.VIOLENT_OR_REPULSIVE }, - { predefinedReasonId: VideoAbusePredefinedReasons.HATEFUL_OR_ABUSIVE }, - { predefinedReasonId: VideoAbusePredefinedReasons.SPAM_OR_MISLEADING }, - { predefinedReasonId: VideoAbusePredefinedReasons.PRIVACY }, - { predefinedReasonId: VideoAbusePredefinedReasons.RIGHTS }, - { predefinedReasonId: VideoAbusePredefinedReasons.SERVER_RULES }, - { predefinedReasonId: VideoAbusePredefinedReasons.THUMBNAILS }, - { predefinedReasonId: VideoAbusePredefinedReasons.CAPTIONS } - ]) -} - -function down (options) { - throw new Error('Not implemented.') -} - -export { - up, - down -} diff --git a/server/lib/activitypub/process/process-flag.ts b/server/lib/activitypub/process/process-flag.ts index d6ea356434c..58c11337361 100644 --- a/server/lib/activitypub/process/process-flag.ts +++ b/server/lib/activitypub/process/process-flag.ts @@ -10,7 +10,6 @@ import { getAPId } from '../../../helpers/activitypub' import { APProcessorOptions } from '../../../types/activitypub-processor.model' import { MActorSignature, MVideoAbuseAccountVideo } from '../../../types/models' import { AccountModel } from '@server/models/account/account' -import { AbuseReasonModel } from '@server/models/video/abuse-reason' async function processFlagActivity (options: APProcessorOptions) { const { activity, byActor } = options @@ -39,9 +38,9 @@ async function processCreateVideoAbuse (activity: ActivityCreate | ActivityFlag, const { video } = await getOrCreateVideoAndAccountAndChannel({ videoObject: object }) const reporterAccount = await sequelizeTypescript.transaction(async t => AccountModel.load(account.id, t)) - const predefinedReasons = flag.tag?.map(tag => parseInt(tag.name, 10)) - const startAt = flag.startTime ? parseInt(flag.startTime, 10) : undefined - const endAt = flag.endTime ? parseInt(flag.endTime, 10) : undefined + const predefinedReasons = flag.tag?.map(tag => parseInt(tag.name, 10)) || [] + const startAt = flag.startAt + const endAt = flag.startAt const videoAbuseInstance = await sequelizeTypescript.transaction(async t => { const videoAbuseData = { @@ -49,6 +48,7 @@ async function processCreateVideoAbuse (activity: ActivityCreate | ActivityFlag, reason: flag.content, videoId: video.id, state: VideoAbuseState.PENDING, + predefinedReasons, startAt, endAt } @@ -57,16 +57,6 @@ async function processCreateVideoAbuse (activity: ActivityCreate | ActivityFlag, videoAbuseInstance.Video = video videoAbuseInstance.Account = reporterAccount - // Add eventual predefined reasons - if (predefinedReasons.length > 0) { - const reasons = [] - for (const reasonId of predefinedReasons) { - reasons.push(await AbuseReasonModel.findByPk(reasonId + 1, { transaction: t })) - } - await videoAbuseInstance.$set('PredefinedReasons', reasons, { transaction: t }) - videoAbuseInstance.PredefinedReasons = reasons - } - logger.info('Remote abuse for video uuid %s created', flag.object) return videoAbuseInstance diff --git a/server/middlewares/validators/videos/video-abuses.ts b/server/middlewares/validators/videos/video-abuses.ts index d82659f88ce..75797c10b91 100644 --- a/server/middlewares/validators/videos/video-abuses.ts +++ b/server/middlewares/validators/videos/video-abuses.ts @@ -79,6 +79,9 @@ const videoAbuseListValidator = [ query('id') .optional() .custom(isIdValid).withMessage('Should have a valid id'), + query('predefinedReasonId') + .optional() + .custom(isIdValid).withMessage('Should have a valid predefinedReasonId'), query('search') .optional() .custom(exists).withMessage('Should have a valid search'), diff --git a/server/models/video/abuse-reason.ts b/server/models/video/abuse-reason.ts deleted file mode 100644 index cff108549ab..00000000000 --- a/server/models/video/abuse-reason.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { AllowNull, BelongsToMany, Column, Model, Table } from 'sequelize-typescript' -import { VideoAbuseModel } from './video-abuse' -import { VideoAbuseReasonModel } from './video-abuse-reason' - -@Table({ - tableName: 'abuseReason', - timestamps: false, - indexes: [ - { - fields: [ 'predefinedReasonId' ], - unique: true - } - ] -}) -export class AbuseReasonModel extends Model { - - @AllowNull(false) - @Column - predefinedReasonId: number - - @BelongsToMany(() => VideoAbuseModel, { - foreignKey: 'abuseReasonId', - through: () => VideoAbuseReasonModel, - onDelete: 'CASCADE' - }) - Abuses: VideoAbuseModel[] -} diff --git a/server/models/video/video-abuse-reason.ts b/server/models/video/video-abuse-reason.ts deleted file mode 100644 index 81dbebf8217..00000000000 --- a/server/models/video/video-abuse-reason.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { Column, CreatedAt, ForeignKey, Model, Table, UpdatedAt } from 'sequelize-typescript' -import { AbuseReasonModel } from './abuse-reason' -import { VideoAbuseModel } from './video-abuse' - -@Table({ - tableName: 'videoAbuseReason', - indexes: [ - { - fields: [ 'videoAbuseId' ] - }, - { - fields: [ 'abuseReasonId' ] - } - ] -}) -export class VideoAbuseReasonModel extends Model { - @CreatedAt - createdAt: Date - - @UpdatedAt - updatedAt: Date - - @ForeignKey(() => VideoAbuseModel) - @Column - videoAbuseId: number - - @ForeignKey(() => AbuseReasonModel) - @Column - abuseReasonId: number -} diff --git a/server/models/video/video-abuse.ts b/server/models/video/video-abuse.ts index bc5f607aee1..7579b575a3b 100644 --- a/server/models/video/video-abuse.ts +++ b/server/models/video/video-abuse.ts @@ -12,8 +12,7 @@ import { Model, Scopes, Table, - UpdatedAt, - BelongsToMany + UpdatedAt } from 'sequelize-typescript' import { VideoAbuseVideoIs } from '@shared/models/videos/abuse/video-abuse-video-is.type' import { VideoAbuseState, VideoDetails } from '../../../shared' @@ -32,12 +31,9 @@ import { ThumbnailModel } from './thumbnail' import { VideoModel } from './video' import { VideoBlacklistModel } from './video-blacklist' import { ScopeNames as VideoChannelScopeNames, SummaryOptions, VideoChannelModel } from './video-channel' -import { AbuseReasonModel } from './abuse-reason' -import { VideoAbuseReasonModel } from './video-abuse-reason' export enum ScopeNames { - FOR_API = 'FOR_API', - WITH_ABUSE_REASON = 'WITH_ABUSE_REASON' + FOR_API = 'FOR_API' } @Scopes(() => ({ @@ -51,6 +47,7 @@ export enum ScopeNames { // filters id?: number + predefinedReasonId?: number state?: VideoAbuseState videoIs?: VideoAbuseVideoIs @@ -108,6 +105,14 @@ export enum ScopeNames { }) } + if (options.predefinedReasonId) { + Object.assign(where, { + predefinedReasons: { + [Op.contains]: [ options.predefinedReasonId ] + } + }) + } + const onlyBlacklisted = options.videoIs === 'blacklisted' return { @@ -224,9 +229,6 @@ export enum ScopeNames { ], where } - }, - [ScopeNames.WITH_ABUSE_REASON]: { - include: [ AbuseReasonModel ] } })) @Table({ @@ -265,6 +267,11 @@ export class VideoAbuseModel extends Model { @Column(DataType.JSONB) deletedVideo: VideoDetails + @AllowNull(true) + @Default(null) + @Column(DataType.ARRAY(DataType.INTEGER)) + predefinedReasons: number[] + @AllowNull(true) @Default(null) @Column @@ -305,13 +312,6 @@ export class VideoAbuseModel extends Model { }) Video: VideoModel - @BelongsToMany(() => AbuseReasonModel, { - foreignKey: 'videoAbuseId', - through: () => VideoAbuseReasonModel, - onDelete: 'CASCADE' - }) - PredefinedReasons: AbuseReasonModel[] - static loadByIdAndVideoId (id: number, videoId?: number, uuid?: string): Bluebird { const videoAttributes = {} if (videoId) videoAttributes['videoId'] = videoId @@ -335,6 +335,7 @@ export class VideoAbuseModel extends Model { user?: MUserAccountId id?: number + predefinedReasonId?: number state?: VideoAbuseState videoIs?: VideoAbuseVideoIs @@ -353,6 +354,7 @@ export class VideoAbuseModel extends Model { serverAccountId, state, videoIs, + predefinedReasonId, searchReportee, searchVideo, searchVideoChannel, @@ -372,6 +374,7 @@ export class VideoAbuseModel extends Model { const filters = { id, + predefinedReasonId, search, state, videoIs, @@ -385,8 +388,7 @@ export class VideoAbuseModel extends Model { return VideoAbuseModel .scope([ - { method: [ ScopeNames.FOR_API, filters ] }, - 'WITH_ABUSE_REASON' + { method: [ ScopeNames.FOR_API, filters ] } ]) .findAndCountAll(query) .then(({ rows, count }) => { @@ -395,7 +397,6 @@ export class VideoAbuseModel extends Model { } toFormattedJSON (this: MVideoAbuseFormattable): VideoAbuse { - const predefinedReasons = this.PredefinedReasons || [] const countReportsForVideo = this.get('countReportsForVideo') as number const nthReportForVideo = this.get('nthReportForVideo') as number const countReportsForReporterVideo = this.get('countReportsForReporter__video') as number @@ -410,7 +411,7 @@ export class VideoAbuseModel extends Model { return { id: this.id, reason: this.reason, - predefinedReasons: predefinedReasons.map(r => r.predefinedReasonId), + predefinedReasons: this.predefinedReasons, reporterAccount: this.Account.toFormattedJSON(), state: { id: this.state, @@ -439,20 +440,19 @@ export class VideoAbuseModel extends Model { } toActivityPubObject (this: MVideoAbuseVideo): VideoAbuseObject { - const predefinedReasons = this.PredefinedReasons || [] - const startTime = this.startAt?.toString() - const endTime = this.endAt?.toString() + const startAt = this.startAt + const endAt = this.endAt return { type: 'Flag' as 'Flag', content: this.reason, object: this.Video.url, - tag: predefinedReasons.map(r => ({ + tag: this.predefinedReasons.map(r => ({ type: 'Hashtag' as 'Hashtag', - name: r.predefinedReasonId.toString() + name: r.toString() })), - startTime, - endTime + startAt, + endAt } } diff --git a/shared/models/activitypub/activity.ts b/shared/models/activitypub/activity.ts index 385a4b943e6..31b9e467397 100644 --- a/shared/models/activitypub/activity.ts +++ b/shared/models/activitypub/activity.ts @@ -114,6 +114,6 @@ export interface ActivityFlag extends BaseActivity { content: string object: APObject | APObject[] tag?: ActivityFlagReasonObject[] - startTime?: string - endTime?: string + startAt?: number + endAt?: number } diff --git a/shared/models/activitypub/objects/video-abuse-object.ts b/shared/models/activitypub/objects/video-abuse-object.ts index 13b7b3c4310..73add8ef447 100644 --- a/shared/models/activitypub/objects/video-abuse-object.ts +++ b/shared/models/activitypub/objects/video-abuse-object.ts @@ -5,6 +5,6 @@ export interface VideoAbuseObject { content: string object: string | string[] tag?: ActivityFlagReasonObject[] - startTime?: string - endTime?: string + startAt?: number + endAt?: number } From d26975213698c1730f82bb286ac4a8055f5b1d95 Mon Sep 17 00:00:00 2001 From: Rigel Kent Date: Sat, 13 Jun 2020 22:53:33 +0200 Subject: [PATCH 4/9] display reported timestamp in video-abuse-detail --- .../video-abuse-details.component.html | 7 +++++++ .../video-abuse-list/video-abuse-details.component.ts | 10 ++++++++++ .../src/app/shared/video-abuse/video-abuse.service.ts | 1 - .../app/shared/video/modals/video-report.component.ts | 3 +-- 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.html b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.html index 90ce2523278..9eeaac74b49 100644 --- a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.html +++ b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.html @@ -66,6 +66,13 @@
+
+ Reported parts + + {{ startAt }} - {{ endAt }} + +
+
Note diff --git a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.ts b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.ts index 1b84f1940ba..ae3a63abdac 100644 --- a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.ts +++ b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.ts @@ -3,6 +3,7 @@ import { Actor } from '@app/shared/actor/actor.model' import { VideoAbusePredefinedReasons } from '../../../../../../shared/models/videos/abuse/video-abuse-reason.model' import { ProcessedVideoAbuse } from './video-abuse-list.component' import { I18n } from '@ngx-translate/i18n-polyfill' +import { durationToString } from '@app/shared/misc/utils' @Component({ selector: 'my-video-abuse-details', @@ -30,12 +31,21 @@ export class VideoAbuseDetailsComponent { } get predefinedReasons () { + if (!this.videoAbuse.predefinedReasons) return [] return this.videoAbuse.predefinedReasons.map(r => ({ id: r, label: this.predefinedReasonsTranslations[r] })) } + get startAt () { + return durationToString(this.videoAbuse.startAt) + } + + get endAt () { + return durationToString(this.videoAbuse.endAt) + } + switchToDefaultAvatar ($event: Event) { ($event.target as HTMLImageElement).src = Actor.GET_DEFAULT_AVATAR_URL() } diff --git a/client/src/app/shared/video-abuse/video-abuse.service.ts b/client/src/app/shared/video-abuse/video-abuse.service.ts index a1d1d9d4195..9af19f01495 100644 --- a/client/src/app/shared/video-abuse/video-abuse.service.ts +++ b/client/src/app/shared/video-abuse/video-abuse.service.ts @@ -56,7 +56,6 @@ export class VideoAbuseService { predefinedReasonId: { prefix: 'tag:', handler: v => { - console.log(v) try { const id = parseInt(v, 10) return id diff --git a/client/src/app/shared/video/modals/video-report.component.ts b/client/src/app/shared/video/modals/video-report.component.ts index f32ce17f13b..cd9a9bf9d56 100644 --- a/client/src/app/shared/video/modals/video-report.component.ts +++ b/client/src/app/shared/video/modals/video-report.component.ts @@ -23,11 +23,10 @@ export class VideoReportComponent extends FormReactive implements OnInit { error: string = null predefinedReasons: { id: PredefinedReasons, label: string, description?: string, help?: string }[] = [] + embedHtml: SafeHtml private openedModal: NgbModalRef - embedHtml: SafeHtml - constructor ( protected formValidatorService: FormValidatorService, private modalService: NgbModal, From 2b7b9550b0852b6fed3357451e6b31020ab10dad Mon Sep 17 00:00:00 2001 From: Rigel Kent Date: Mon, 15 Jun 2020 12:07:36 +0200 Subject: [PATCH 5/9] correct VideoAbuseCreate --- .../video-abuse-details.component.html | 6 +- .../video-abuse-details.component.ts | 16 ++--- .../video-abuse-list.component.ts | 12 +++- client/src/app/shared/rest/rest.service.ts | 2 +- client/src/app/shared/video-abuse/index.ts | 1 - .../video-abuse-predefined-reasons.model.ts | 14 ---- .../shared/video-abuse/video-abuse.service.ts | 12 ++-- .../video/modals/video-report.component.ts | 72 ++++++++++--------- server/controllers/api/videos/abuse.ts | 7 +- .../helpers/custom-validators/video-abuses.ts | 5 -- .../lib/activitypub/process/process-flag.ts | 6 +- .../validators/videos/video-abuses.ts | 12 ++-- .../activitypub/objects/common-objects.ts | 7 +- .../videos/abuse/video-abuse-create.model.ts | 5 +- .../videos/abuse/video-abuse-reason.model.ts | 13 +++- 15 files changed, 99 insertions(+), 91 deletions(-) delete mode 100644 client/src/app/shared/video-abuse/video-abuse-predefined-reasons.model.ts diff --git a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.html b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.html index 9eeaac74b49..f8ef78c815d 100644 --- a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.html +++ b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.html @@ -57,17 +57,17 @@
-
+
- +
{{ reason.label }}
- Reported parts + Reported part {{ startAt }} - {{ endAt }} diff --git a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.ts b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.ts index ae3a63abdac..b79580868a8 100644 --- a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.ts +++ b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.ts @@ -30,14 +30,6 @@ export class VideoAbuseDetailsComponent { } } - get predefinedReasons () { - if (!this.videoAbuse.predefinedReasons) return [] - return this.videoAbuse.predefinedReasons.map(r => ({ - id: r, - label: this.predefinedReasonsTranslations[r] - })) - } - get startAt () { return durationToString(this.videoAbuse.startAt) } @@ -46,6 +38,14 @@ export class VideoAbuseDetailsComponent { return durationToString(this.videoAbuse.endAt) } + getPredefinedReasons () { + if (!this.videoAbuse.predefinedReasons) return [] + return this.videoAbuse.predefinedReasons.map(r => ({ + id: r, + label: this.predefinedReasonsTranslations[r] + })) + } + switchToDefaultAvatar ($event: Event) { ($event.target as HTMLImageElement).src = Actor.GET_DEFAULT_AVATAR_URL() } diff --git a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts index 86ad40dee90..d7f5beef3a4 100644 --- a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts +++ b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-list.component.ts @@ -11,7 +11,7 @@ import { ModerationCommentModalComponent } from './moderation-comment-modal.comp import { Video } from '../../../shared/video/video.model' import { MarkdownService } from '@app/shared/renderer' import { Actor } from '@app/shared/actor/actor.model' -import { buildVideoEmbed } from 'src/assets/player/utils' +import { buildVideoEmbed, buildVideoLink } from 'src/assets/player/utils' import { DomSanitizer } from '@angular/platform-browser' import { BlocklistService } from '@app/shared/blocklist' import { VideoService } from '@app/shared/video/video.service' @@ -259,7 +259,15 @@ export class VideoAbuseListComponent extends RestTable implements OnInit, AfterV } getVideoEmbed (videoAbuse: VideoAbuse) { - return buildVideoEmbed(`${environment.embedUrl}/videos/embed/${videoAbuse.video.uuid}`) + return buildVideoEmbed( + buildVideoLink({ + baseUrl: `${environment.embedUrl}/videos/embed/${videoAbuse.video.uuid}`, + title: false, + warningTitle: false, + startTime: videoAbuse.startAt, + stopTime: videoAbuse.endAt + }) + ) } switchToDefaultAvatar ($event: Event) { diff --git a/client/src/app/shared/rest/rest.service.ts b/client/src/app/shared/rest/rest.service.ts index bea329adcb0..78558851a79 100644 --- a/client/src/app/shared/rest/rest.service.ts +++ b/client/src/app/shared/rest/rest.service.ts @@ -103,7 +103,7 @@ export class RestService { } return { - search: searchTokens.join(' '), + search: searchTokens.join(' ') || undefined, ...additionalFilters } diff --git a/client/src/app/shared/video-abuse/index.ts b/client/src/app/shared/video-abuse/index.ts index 0c3a48d83b7..92cbfb5f904 100644 --- a/client/src/app/shared/video-abuse/index.ts +++ b/client/src/app/shared/video-abuse/index.ts @@ -1,2 +1 @@ export * from './video-abuse.service' -export * from './video-abuse-predefined-reasons.model' diff --git a/client/src/app/shared/video-abuse/video-abuse-predefined-reasons.model.ts b/client/src/app/shared/video-abuse/video-abuse-predefined-reasons.model.ts deleted file mode 100644 index 5969f48cea8..00000000000 --- a/client/src/app/shared/video-abuse/video-abuse-predefined-reasons.model.ts +++ /dev/null @@ -1,14 +0,0 @@ -export enum PredefinedReasons { - violentOrRepulsive = 'violentOrRepulsive', - hatefulOrAbusive = 'hatefulOrAbusive', - spamOrMisleading = 'spamOrMisleading', - privacy = 'privacy', - rights = 'rights', - serverRules = 'serverRules', - thumbnails = 'thumbnails', - captions = 'captions' -} - -export type VideoAbusePredefinedReasons = { - [key in PredefinedReasons]?: boolean -} diff --git a/client/src/app/shared/video-abuse/video-abuse.service.ts b/client/src/app/shared/video-abuse/video-abuse.service.ts index 9af19f01495..0b102a88d5f 100644 --- a/client/src/app/shared/video-abuse/video-abuse.service.ts +++ b/client/src/app/shared/video-abuse/video-abuse.service.ts @@ -3,10 +3,10 @@ import { HttpClient, HttpParams } from '@angular/common/http' import { Injectable } from '@angular/core' import { SortMeta } from 'primeng/api' import { Observable } from 'rxjs' -import { ResultList, VideoAbuse, VideoAbuseUpdate, VideoAbuseState } from '../../../../../shared' +import { ResultList, VideoAbuse, VideoAbuseCreate, VideoAbuseState, VideoAbuseUpdate } from '../../../../../shared' import { environment } from '../../../environments/environment' import { RestExtractor, RestPagination, RestService } from '../rest' -import { VideoAbusePredefinedReasons } from './video-abuse-predefined-reasons.model' +import { omit } from 'lodash-es' @Injectable() export class VideoAbuseService { @@ -59,7 +59,8 @@ export class VideoAbuseService { try { const id = parseInt(v, 10) return id - } catch { + } catch (e) { + console.error('Cannot parse predefinedReasonId in search.', e) return undefined } } @@ -75,11 +76,10 @@ export class VideoAbuseService { ) } - reportVideo (parameters: { id: number, reason: string, predefinedReasons?: VideoAbusePredefinedReasons, timestamp: any }) { + reportVideo (parameters: { id: number } & VideoAbuseCreate) { const url = VideoAbuseService.BASE_VIDEO_ABUSE_URL + parameters.id + '/abuse' - delete parameters.id - const body = { ...parameters } + const body = omit(parameters, [ 'id' ]) return this.authHttp.post(url, body) .pipe( diff --git a/client/src/app/shared/video/modals/video-report.component.ts b/client/src/app/shared/video/modals/video-report.component.ts index cd9a9bf9d56..bc21d7caea4 100644 --- a/client/src/app/shared/video/modals/video-report.component.ts +++ b/client/src/app/shared/video/modals/video-report.component.ts @@ -6,10 +6,12 @@ import { FormValidatorService } from '@app/shared/forms/form-validators/form-val import { VideoAbuseValidatorsService } from '@app/shared/forms/form-validators/video-abuse-validators.service' import { NgbModal } from '@ng-bootstrap/ng-bootstrap' import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap/modal/modal-ref' -import { VideoAbuseService, VideoAbusePredefinedReasons, PredefinedReasons } from '@app/shared/video-abuse' +import { VideoAbuseService } from '@app/shared/video-abuse' import { Video } from '@app/shared/video/video.model' -import { buildVideoEmbed } from 'src/assets/player/utils' +import { buildVideoEmbed, buildVideoLink } from 'src/assets/player/utils' import { DomSanitizer, SafeHtml } from '@angular/platform-browser' +import { VideoAbusePredefinedReasonsIn } from '@shared/models/videos/abuse/video-abuse-reason.model' +import { mapValues, pickBy, keys } from 'lodash-es' @Component({ selector: 'my-video-report', @@ -22,7 +24,7 @@ export class VideoReportComponent extends FormReactive implements OnInit { @ViewChild('modal', { static: true }) modal: NgbModal error: string = null - predefinedReasons: { id: PredefinedReasons, label: string, description?: string, help?: string }[] = [] + predefinedReasons: { id: keyof VideoAbusePredefinedReasonsIn, label: string, description?: string, help?: string }[] = [] embedHtml: SafeHtml private openedModal: NgbModalRef @@ -57,25 +59,20 @@ export class VideoReportComponent extends FormReactive implements OnInit { getVideoEmbed () { return this.sanitizer.bypassSecurityTrustHtml( - buildVideoEmbed(this.video.embedUrl) + buildVideoEmbed( + buildVideoLink({ + baseUrl: this.video.embedUrl, + title: false, + warningTitle: false + }) + ) ) } ngOnInit () { - const predefinedReasons: Required = { - violentOrRepulsive: null, - hatefulOrAbusive: null, - spamOrMisleading: null, - privacy: null, - rights: null, - serverRules: null, - captions: null, - thumbnails: null - } - this.buildForm({ reason: this.videoAbuseValidatorsService.VIDEO_ABUSE_REASON, - predefinedReasons: predefinedReasons as {[key: string]: null}, + predefinedReasons: mapValues(VideoAbusePredefinedReasonsIn, r => null), timestamp: { hasStart: null, startAt: null, @@ -86,42 +83,42 @@ export class VideoReportComponent extends FormReactive implements OnInit { this.predefinedReasons = [ { - id: PredefinedReasons.violentOrRepulsive, + id: 'violentOrRepulsive', label: this.i18n('Violent or repulsive'), help: this.i18n('Contains offensive, violent, or coarse language or iconography.') }, { - id: PredefinedReasons.hatefulOrAbusive, + id: 'hatefulOrAbusive', label: this.i18n('Hateful or abusive'), help: this.i18n('Contains abusive, racist or sexist language or iconography.') }, { - id: PredefinedReasons.spamOrMisleading, + id: 'spamOrMisleading', label: this.i18n('Spam, ad or false news'), help: this.i18n('Contains marketing, spam, purposefully deceitful news, or otherwise misleading thumbnail/text/tags. Please provide reputable sources to report hoaxes.') }, { - id: PredefinedReasons.privacy, + id: 'privacy', label: this.i18n('Privacy breach or doxxing'), help: this.i18n('Contains personal information that could be used to track, identify, contact or impersonate someone (e.g. name, address, phone number, email, or credit card details).') }, { - id: PredefinedReasons.rights, + id: 'rights', label: this.i18n('Intellectual property violation'), help: this.i18n('Infringes my intellectual property or copyright, wrt. the regional rules with which the server must comply.') }, { - id: PredefinedReasons.serverRules, + id: 'serverRules', label: this.i18n('Breaks server rules'), description: this.i18n('Anything not included in the above that breaks the terms of service, code of conduct, or general rules in place on the server.') }, { - id: PredefinedReasons.thumbnails, + id: 'thumbnails', label: this.i18n('Thumbnails'), help: this.i18n('The above can only be seen in thumbnails.') }, { - id: PredefinedReasons.captions, + id: 'captions', label: this.i18n('Captions'), help: this.i18n('The above can only be seen in captions (please describe which).') } @@ -140,15 +137,24 @@ export class VideoReportComponent extends FormReactive implements OnInit { } report () { - this.videoAbuseService.reportVideo({ id: this.video.id, ...this.form.value }) - .subscribe( - () => { - this.notifier.success(this.i18n('Video reported.')) - this.hide() - }, - - err => this.notifier.error(err.message) - ) + const reason = this.form.get('reason').value + const predefinedReasons = pickBy(this.form.get('predefinedReasons').value) + const { hasStart, startAt, hasEnd, endAt } = this.form.get('timestamp').value + + this.videoAbuseService.reportVideo({ + id: this.video.id, + reason, + predefinedReasons, + startAt: hasStart && startAt ? startAt : undefined, + endAt: hasEnd && endAt ? endAt : undefined + }).subscribe( + () => { + this.notifier.success(this.i18n('Video reported.')) + this.hide() + }, + + err => this.notifier.error(err.message) + ) } isRemoteVideo () { diff --git a/server/controllers/api/videos/abuse.ts b/server/controllers/api/videos/abuse.ts index 4b3583fb514..0f1188dd83e 100644 --- a/server/controllers/api/videos/abuse.ts +++ b/server/controllers/api/videos/abuse.ts @@ -127,9 +127,6 @@ async function reportVideoAbuse (req: express.Request, res: express.Response) { const videoAbuseInstance = await sequelizeTypescript.transaction(async t => { reporterAccount = await AccountModel.load(res.locals.oauth.token.User.Account.id, t) const predefinedReasons = keys(pickBy(body.predefinedReasons)).map(r => VideoAbusePredefinedReasonsIn[r]) - const timestamp = body.timestamp - const startAt = timestamp['hasStart'] && timestamp['startAt'] ? timestamp['startAt'] : undefined - const endAt = timestamp['hasEnd'] && timestamp['endAt'] ? timestamp['endAt'] : undefined const abuseToCreate = { reporterAccountId: reporterAccount.id, @@ -137,8 +134,8 @@ async function reportVideoAbuse (req: express.Request, res: express.Response) { videoId: videoInstance.id, state: VideoAbuseState.PENDING, predefinedReasons, - startAt, - endAt + startAt: body.startAt, + endAt: body.endAt } const videoAbuseInstance: MVideoAbuseAccountVideo = await VideoAbuseModel.create(abuseToCreate, { transaction: t }) diff --git a/server/helpers/custom-validators/video-abuses.ts b/server/helpers/custom-validators/video-abuses.ts index 67265493054..ffebbca6962 100644 --- a/server/helpers/custom-validators/video-abuses.ts +++ b/server/helpers/custom-validators/video-abuses.ts @@ -14,10 +14,6 @@ function isVideoAbusePredefinedReasonsValid (value: {}) { return exists(value) } -function isVideoAbuseTimestampValid (value: {}) { - return exists(value) -} - function isVideoAbuseModerationCommentValid (value: string) { return exists(value) && validator.isLength(value, VIDEO_ABUSES_CONSTRAINTS_FIELDS.MODERATION_COMMENT) } @@ -38,7 +34,6 @@ function isAbuseVideoIsValid (value: VideoAbuseVideoIs) { export { isVideoAbuseReasonValid, isVideoAbusePredefinedReasonsValid, - isVideoAbuseTimestampValid, isVideoAbuseModerationCommentValid, isVideoAbuseStateValid, isAbuseVideoIsValid diff --git a/server/lib/activitypub/process/process-flag.ts b/server/lib/activitypub/process/process-flag.ts index 58c11337361..7de75d7962a 100644 --- a/server/lib/activitypub/process/process-flag.ts +++ b/server/lib/activitypub/process/process-flag.ts @@ -38,9 +38,11 @@ async function processCreateVideoAbuse (activity: ActivityCreate | ActivityFlag, const { video } = await getOrCreateVideoAndAccountAndChannel({ videoObject: object }) const reporterAccount = await sequelizeTypescript.transaction(async t => AccountModel.load(account.id, t)) - const predefinedReasons = flag.tag?.map(tag => parseInt(tag.name, 10)) || [] + const tags = Array.isArray(flag.tag) ? flag.tag : [] + const predefinedReasons = tags.map(tag => parseInt(tag.name, 10)) + .filter(v => !isNaN(v)) const startAt = flag.startAt - const endAt = flag.startAt + const endAt = flag.endAt const videoAbuseInstance = await sequelizeTypescript.transaction(async t => { const videoAbuseData = { diff --git a/server/middlewares/validators/videos/video-abuses.ts b/server/middlewares/validators/videos/video-abuses.ts index 75797c10b91..c4d540b221f 100644 --- a/server/middlewares/validators/videos/video-abuses.ts +++ b/server/middlewares/validators/videos/video-abuses.ts @@ -1,6 +1,6 @@ import * as express from 'express' import { body, param, query } from 'express-validator' -import { exists, isIdOrUUIDValid, isIdValid } from '../../../helpers/custom-validators/misc' +import { exists, isIdOrUUIDValid, isIdValid, toIntOrNull } from '../../../helpers/custom-validators/misc' import { isAbuseVideoIsValid, isVideoAbuseModerationCommentValid, @@ -26,10 +26,14 @@ const videoAbuseReportValidator = [ .optional() .custom(isVideoAbusePredefinedReasonsValid) .withMessage('Should have a valid list of predefined reasons'), - body('timestamp') + body('startAt') .optional() - .custom(isVideoAbuseTimestampValid) - .withMessage('Should have valid timestamp definition'), + .custom(toIntOrNull) + .withMessage('Should have valid starting time value'), + body('endAt') + .optional() + .custom(toIntOrNull) + .withMessage('Should have valid ending time value'), async (req: express.Request, res: express.Response, next: express.NextFunction) => { logger.debug('Checking videoAbuseReport parameters', { parameters: req.body }) diff --git a/shared/models/activitypub/objects/common-objects.ts b/shared/models/activitypub/objects/common-objects.ts index 3c2bc3f35b8..704979e5940 100644 --- a/shared/models/activitypub/objects/common-objects.ts +++ b/shared/models/activitypub/objects/common-objects.ts @@ -70,20 +70,19 @@ export type ActivityHtmlUrlObject = { } export interface ActivityHashTagObject { - type: 'Hashtag' | 'Mention' + type: 'Hashtag' href?: string name: string } export interface ActivityMentionObject { - type: 'Hashtag' | 'Mention' + type: 'Mention' href?: string name: string } export interface ActivityFlagReasonObject { - type: 'Hashtag' | 'Mention' - href?: string + type: 'Hashtag' name: string } diff --git a/shared/models/videos/abuse/video-abuse-create.model.ts b/shared/models/videos/abuse/video-abuse-create.model.ts index b2cc2da0b9f..ba1fee3bda9 100644 --- a/shared/models/videos/abuse/video-abuse-create.model.ts +++ b/shared/models/videos/abuse/video-abuse-create.model.ts @@ -1,5 +1,6 @@ export interface VideoAbuseCreate { reason: string - predefinedReasons: any - timestamp: any + predefinedReasons?: {[key: string]: boolean} // see VideoAbusePredefinedReasonsIn + startAt?: number + endAt?: number } diff --git a/shared/models/videos/abuse/video-abuse-reason.model.ts b/shared/models/videos/abuse/video-abuse-reason.model.ts index 62487171140..ae9bb811cf4 100644 --- a/shared/models/videos/abuse/video-abuse-reason.model.ts +++ b/shared/models/videos/abuse/video-abuse-reason.model.ts @@ -9,7 +9,18 @@ export enum VideoAbusePredefinedReasons { CAPTIONS } -export const VideoAbusePredefinedReasonsIn = { +export interface VideoAbusePredefinedReasonsIn { + violentOrRepulsive: VideoAbusePredefinedReasons + hatefulOrAbusive: VideoAbusePredefinedReasons + spamOrMisleading: VideoAbusePredefinedReasons + privacy: VideoAbusePredefinedReasons + rights: VideoAbusePredefinedReasons + serverRules: VideoAbusePredefinedReasons + thumbnails: VideoAbusePredefinedReasons + captions: VideoAbusePredefinedReasons +} + +export const VideoAbusePredefinedReasonsIn: VideoAbusePredefinedReasonsIn = { violentOrRepulsive: VideoAbusePredefinedReasons.VIOLENT_OR_REPULSIVE, hatefulOrAbusive: VideoAbusePredefinedReasons.HATEFUL_OR_ABUSIVE, spamOrMisleading: VideoAbusePredefinedReasons.SPAM_OR_MISLEADING, From f3c298d3a9b31d9644c331fa3f9b89f27619a6b8 Mon Sep 17 00:00:00 2001 From: Rigel Kent Date: Thu, 18 Jun 2020 18:45:10 +0200 Subject: [PATCH 6/9] switch from object to array predefinedReasons --- .../video/modals/video-report.component.ts | 4 ++-- server/controllers/api/videos/abuse.ts | 2 +- .../helpers/custom-validators/video-abuses.ts | 6 ++++-- .../validators/videos/video-abuses.ts | 3 +-- .../videos/abuse/video-abuse-create.model.ts | 4 +++- .../videos/abuse/video-abuse-reason.model.ts | 21 +++++++++---------- 6 files changed, 21 insertions(+), 19 deletions(-) diff --git a/client/src/app/shared/video/modals/video-report.component.ts b/client/src/app/shared/video/modals/video-report.component.ts index bc21d7caea4..39085a069a7 100644 --- a/client/src/app/shared/video/modals/video-report.component.ts +++ b/client/src/app/shared/video/modals/video-report.component.ts @@ -24,7 +24,7 @@ export class VideoReportComponent extends FormReactive implements OnInit { @ViewChild('modal', { static: true }) modal: NgbModal error: string = null - predefinedReasons: { id: keyof VideoAbusePredefinedReasonsIn, label: string, description?: string, help?: string }[] = [] + predefinedReasons: { id: VideoAbusePredefinedReasonsIn, label: string, description?: string, help?: string }[] = [] embedHtml: SafeHtml private openedModal: NgbModalRef @@ -138,7 +138,7 @@ export class VideoReportComponent extends FormReactive implements OnInit { report () { const reason = this.form.get('reason').value - const predefinedReasons = pickBy(this.form.get('predefinedReasons').value) + const predefinedReasons = keys(pickBy(this.form.get('predefinedReasons').value)) as VideoAbusePredefinedReasonsIn[] const { hasStart, startAt, hasEnd, endAt } = this.form.get('timestamp').value this.videoAbuseService.reportVideo({ diff --git a/server/controllers/api/videos/abuse.ts b/server/controllers/api/videos/abuse.ts index 0f1188dd83e..ff34da9d6be 100644 --- a/server/controllers/api/videos/abuse.ts +++ b/server/controllers/api/videos/abuse.ts @@ -126,7 +126,7 @@ async function reportVideoAbuse (req: express.Request, res: express.Response) { const videoAbuseInstance = await sequelizeTypescript.transaction(async t => { reporterAccount = await AccountModel.load(res.locals.oauth.token.User.Account.id, t) - const predefinedReasons = keys(pickBy(body.predefinedReasons)).map(r => VideoAbusePredefinedReasonsIn[r]) + const predefinedReasons = body.predefinedReasons.map(r => VideoAbusePredefinedReasonsIn[r]) const abuseToCreate = { reporterAccountId: reporterAccount.id, diff --git a/server/helpers/custom-validators/video-abuses.ts b/server/helpers/custom-validators/video-abuses.ts index ffebbca6962..d3a83e040ad 100644 --- a/server/helpers/custom-validators/video-abuses.ts +++ b/server/helpers/custom-validators/video-abuses.ts @@ -1,8 +1,10 @@ import validator from 'validator' +import { keys } from 'lodash' import { CONSTRAINTS_FIELDS, VIDEO_ABUSE_STATES } from '../../initializers/constants' import { exists } from './misc' import { VideoAbuseVideoIs } from '@shared/models/videos/abuse/video-abuse-video-is.type' +import { VideoAbusePredefinedReasonsIn } from '@shared/models/videos/abuse/video-abuse-reason.model' const VIDEO_ABUSES_CONSTRAINTS_FIELDS = CONSTRAINTS_FIELDS.VIDEO_ABUSES @@ -10,8 +12,8 @@ function isVideoAbuseReasonValid (value: string) { return exists(value) && validator.isLength(value, VIDEO_ABUSES_CONSTRAINTS_FIELDS.REASON) } -function isVideoAbusePredefinedReasonsValid (value: {}) { - return exists(value) +function isVideoAbusePredefinedReasonsValid (value: VideoAbusePredefinedReasonsIn[]) { + return exists(value) && value.every(element => keys(VideoAbusePredefinedReasonsIn).includes(element)) } function isVideoAbuseModerationCommentValid (value: string) { diff --git a/server/middlewares/validators/videos/video-abuses.ts b/server/middlewares/validators/videos/video-abuses.ts index c4d540b221f..d0b2f7f0336 100644 --- a/server/middlewares/validators/videos/video-abuses.ts +++ b/server/middlewares/validators/videos/video-abuses.ts @@ -6,8 +6,7 @@ import { isVideoAbuseModerationCommentValid, isVideoAbuseReasonValid, isVideoAbuseStateValid, - isVideoAbusePredefinedReasonsValid, - isVideoAbuseTimestampValid + isVideoAbusePredefinedReasonsValid } from '../../../helpers/custom-validators/video-abuses' import { logger } from '../../../helpers/logger' import { doesVideoAbuseExist, doesVideoExist } from '../../../helpers/middlewares' diff --git a/shared/models/videos/abuse/video-abuse-create.model.ts b/shared/models/videos/abuse/video-abuse-create.model.ts index ba1fee3bda9..54f3637b585 100644 --- a/shared/models/videos/abuse/video-abuse-create.model.ts +++ b/shared/models/videos/abuse/video-abuse-create.model.ts @@ -1,6 +1,8 @@ +import { VideoAbusePredefinedReasonsIn } from './video-abuse-reason.model' + export interface VideoAbuseCreate { reason: string - predefinedReasons?: {[key: string]: boolean} // see VideoAbusePredefinedReasonsIn + predefinedReasons?: VideoAbusePredefinedReasonsIn[] startAt?: number endAt?: number } diff --git a/shared/models/videos/abuse/video-abuse-reason.model.ts b/shared/models/videos/abuse/video-abuse-reason.model.ts index ae9bb811cf4..8dd473227b1 100644 --- a/shared/models/videos/abuse/video-abuse-reason.model.ts +++ b/shared/models/videos/abuse/video-abuse-reason.model.ts @@ -9,18 +9,17 @@ export enum VideoAbusePredefinedReasons { CAPTIONS } -export interface VideoAbusePredefinedReasonsIn { - violentOrRepulsive: VideoAbusePredefinedReasons - hatefulOrAbusive: VideoAbusePredefinedReasons - spamOrMisleading: VideoAbusePredefinedReasons - privacy: VideoAbusePredefinedReasons - rights: VideoAbusePredefinedReasons - serverRules: VideoAbusePredefinedReasons - thumbnails: VideoAbusePredefinedReasons - captions: VideoAbusePredefinedReasons -} +export type VideoAbusePredefinedReasonsIn = + 'violentOrRepulsive' | + 'hatefulOrAbusive' | + 'spamOrMisleading' | + 'privacy' | + 'rights' | + 'serverRules' | + 'thumbnails' | + 'captions' -export const VideoAbusePredefinedReasonsIn: VideoAbusePredefinedReasonsIn = { +export const VideoAbusePredefinedReasonsIn = { violentOrRepulsive: VideoAbusePredefinedReasons.VIOLENT_OR_REPULSIVE, hatefulOrAbusive: VideoAbusePredefinedReasons.HATEFUL_OR_ABUSIVE, spamOrMisleading: VideoAbusePredefinedReasons.SPAM_OR_MISLEADING, From 5ff6adf3a38cc0c3f501b6f297fe97cc460a6c62 Mon Sep 17 00:00:00 2001 From: Rigel Kent Date: Thu, 18 Jun 2020 19:10:15 +0200 Subject: [PATCH 7/9] update OpenAPI to reflect abuse create API --- support/doc/api/openapi.yaml | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/support/doc/api/openapi.yaml b/support/doc/api/openapi.yaml index 501187d8fb4..35891877d60 100644 --- a/support/doc/api/openapi.yaml +++ b/support/doc/api/openapi.yaml @@ -120,7 +120,7 @@ x-tagGroups: - name: Moderation tags: - Video Abuses - - Video Blacklist + - Video Blocks - name: Instance Configuration tags: - Config @@ -1245,6 +1245,7 @@ paths: parameters: - $ref: '#/components/parameters/idOrUUID' requestBody: + required: true content: application/json: schema: @@ -1253,6 +1254,22 @@ paths: reason: description: Reason why the user reports this video type: string + predefinedReasons: + description: Reason categories that help triage reports + type: array + items: + type: string + enum: + - violentOrAbusive + - hatefulOrAbusive + - spamOrMisleading + - privacy + - rights + - serverRules + - thumbnails + - captions + required: + - reason responses: '204': description: successful operation @@ -2488,6 +2505,19 @@ components: $ref: '#/components/schemas/VideoAbuseStateSet' label: type: string + VideoAbusePredefinedReasons: + type: array + items: + type: string + enum: + - violentOrAbusive + - hatefulOrAbusive + - spamOrMisleading + - privacy + - rights + - serverRules + - thumbnails + - captions VideoResolutionConstant: properties: @@ -2739,6 +2769,8 @@ components: type: number reason: type: string + predefinedReasons: + $ref: '#/components/schemas/VideoAbusePredefinedReasons' reporterAccount: $ref: '#/components/schemas/Account' state: From 17afa2076935f87edd8cf91a89151a8ac309eab3 Mon Sep 17 00:00:00 2001 From: Rigel Kent Date: Sat, 20 Jun 2020 19:19:39 +0200 Subject: [PATCH 8/9] move API and AP object from number to string enum --- .../video-abuse-details.component.html | 2 +- .../video-abuse-details.component.ts | 20 ++++----- .../shared/video-abuse/video-abuse.service.ts | 13 +----- .../video/modals/video-report.component.ts | 10 ++--- client/src/sass/include/_mixins.scss | 11 ++++- server/controllers/api/videos/abuse.ts | 8 ++-- .../helpers/custom-validators/video-abuses.ts | 19 +++++--- .../0515-video-abuse-reason-timestamps.ts | 5 +++ .../lib/activitypub/process/process-flag.ts | 9 +++- .../validators/videos/video-abuses.ts | 15 ++++--- server/models/video/video-abuse.ts | 31 ++++++++++--- server/tests/api/videos/video-abuse.ts | 44 ++++++++++++++++--- shared/extra-utils/videos/video-abuses.ts | 18 ++++++-- .../activitypub/objects/common-objects.ts | 4 +- .../videos/abuse/video-abuse-create.model.ts | 4 +- .../videos/abuse/video-abuse-reason.model.ts | 8 ++-- .../models/videos/abuse/video-abuse.model.ts | 3 +- 17 files changed, 153 insertions(+), 71 deletions(-) diff --git a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.html b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.html index f8ef78c815d..5512bb1dea8 100644 --- a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.html +++ b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.html @@ -60,7 +60,7 @@
- +
{{ reason.label }}
 diff --git a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.ts b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.ts index b79580868a8..13485124f21 100644 --- a/client/src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.ts +++ b/client/src/app/+admin/moderation/video-abuse-list/video-abuse-details.component.ts @@ -1,6 +1,6 @@ import { Component, Input } from '@angular/core' import { Actor } from '@app/shared/actor/actor.model' -import { VideoAbusePredefinedReasons } from '../../../../../../shared/models/videos/abuse/video-abuse-reason.model' +import { VideoAbusePredefinedReasonsString } from '../../../../../../shared/models/videos/abuse/video-abuse-reason.model' import { ProcessedVideoAbuse } from './video-abuse-list.component' import { I18n } from '@ngx-translate/i18n-polyfill' import { durationToString } from '@app/shared/misc/utils' @@ -13,20 +13,20 @@ import { durationToString } from '@app/shared/misc/utils' export class VideoAbuseDetailsComponent { @Input() videoAbuse: ProcessedVideoAbuse - private predefinedReasonsTranslations: { [key: number]: string } + private predefinedReasonsTranslations: { [key in VideoAbusePredefinedReasonsString]: string } constructor ( private i18n: I18n ) { this.predefinedReasonsTranslations = { - [VideoAbusePredefinedReasons.VIOLENT_OR_REPULSIVE]: this.i18n('Violent or Repulsive'), - [VideoAbusePredefinedReasons.HATEFUL_OR_ABUSIVE]: this.i18n('Hateful or Abusive'), - [VideoAbusePredefinedReasons.SPAM_OR_MISLEADING]: this.i18n('Spam or Misleading'), - [VideoAbusePredefinedReasons.PRIVACY]: this.i18n('Privacy'), - [VideoAbusePredefinedReasons.RIGHTS]: this.i18n('Rights'), - [VideoAbusePredefinedReasons.SERVER_RULES]: this.i18n('Server rules'), - [VideoAbusePredefinedReasons.THUMBNAILS]: this.i18n('Thumbnails'), - [VideoAbusePredefinedReasons.CAPTIONS]: this.i18n('Captions') + violentOrRepulsive: this.i18n('Violent or Repulsive'), + hatefulOrAbusive: this.i18n('Hateful or Abusive'), + spamOrMisleading: this.i18n('Spam or Misleading'), + privacy: this.i18n('Privacy'), + rights: this.i18n('Rights'), + serverRules: this.i18n('Server rules'), + thumbnails: this.i18n('Thumbnails'), + captions: this.i18n('Captions') } } diff --git a/client/src/app/shared/video-abuse/video-abuse.service.ts b/client/src/app/shared/video-abuse/video-abuse.service.ts index 0b102a88d5f..43f4674b14b 100644 --- a/client/src/app/shared/video-abuse/video-abuse.service.ts +++ b/client/src/app/shared/video-abuse/video-abuse.service.ts @@ -53,18 +53,7 @@ export class VideoAbuseService { }, searchReporter: { prefix: 'reporter:' }, searchReportee: { prefix: 'reportee:' }, - predefinedReasonId: { - prefix: 'tag:', - handler: v => { - try { - const id = parseInt(v, 10) - return id - } catch (e) { - console.error('Cannot parse predefinedReasonId in search.', e) - return undefined - } - } - } + predefinedReason: { prefix: 'tag:' } }) params = this.restService.addObjectParams(params, filters) diff --git a/client/src/app/shared/video/modals/video-report.component.ts b/client/src/app/shared/video/modals/video-report.component.ts index 39085a069a7..0a01a4a179a 100644 --- a/client/src/app/shared/video/modals/video-report.component.ts +++ b/client/src/app/shared/video/modals/video-report.component.ts @@ -10,8 +10,8 @@ import { VideoAbuseService } from '@app/shared/video-abuse' import { Video } from '@app/shared/video/video.model' import { buildVideoEmbed, buildVideoLink } from 'src/assets/player/utils' import { DomSanitizer, SafeHtml } from '@angular/platform-browser' -import { VideoAbusePredefinedReasonsIn } from '@shared/models/videos/abuse/video-abuse-reason.model' -import { mapValues, pickBy, keys } from 'lodash-es' +import { VideoAbusePredefinedReasonsString, VideoAbusePredefinedReasonsMap } from '@shared/models/videos/abuse/video-abuse-reason.model' +import { mapValues, pickBy } from 'lodash-es' @Component({ selector: 'my-video-report', @@ -24,7 +24,7 @@ export class VideoReportComponent extends FormReactive implements OnInit { @ViewChild('modal', { static: true }) modal: NgbModal error: string = null - predefinedReasons: { id: VideoAbusePredefinedReasonsIn, label: string, description?: string, help?: string }[] = [] + predefinedReasons: { id: VideoAbusePredefinedReasonsString, label: string, description?: string, help?: string }[] = [] embedHtml: SafeHtml private openedModal: NgbModalRef @@ -72,7 +72,7 @@ export class VideoReportComponent extends FormReactive implements OnInit { ngOnInit () { this.buildForm({ reason: this.videoAbuseValidatorsService.VIDEO_ABUSE_REASON, - predefinedReasons: mapValues(VideoAbusePredefinedReasonsIn, r => null), + predefinedReasons: mapValues(VideoAbusePredefinedReasonsMap, r => null), timestamp: { hasStart: null, startAt: null, @@ -138,7 +138,7 @@ export class VideoReportComponent extends FormReactive implements OnInit { report () { const reason = this.form.get('reason').value - const predefinedReasons = keys(pickBy(this.form.get('predefinedReasons').value)) as VideoAbusePredefinedReasonsIn[] + const predefinedReasons = Object.keys(pickBy(this.form.get('predefinedReasons').value)) as VideoAbusePredefinedReasonsString[] const { hasStart, startAt, hasEnd, endAt } = this.form.get('timestamp').value this.videoAbuseService.reportVideo({ diff --git a/client/src/sass/include/_mixins.scss b/client/src/sass/include/_mixins.scss index eb80ea0e32b..6a1deac7677 100644 --- a/client/src/sass/include/_mixins.scss +++ b/client/src/sass/include/_mixins.scss @@ -804,10 +804,12 @@ } @mixin chip { + --chip-radius: 5rem; + --chip-padding: .2rem .4rem; $avatar-height: 1.2rem; align-items: center; - border-radius: 5rem; + border-radius: var(--chip-radius); display: inline-flex; font-size: 90%; color: pvar(--mainForegroundColor); @@ -816,12 +818,17 @@ margin: .1rem; max-width: 320px; overflow: hidden; - padding: .2rem .4rem; + padding: var(--chip-padding); text-decoration: none; text-overflow: ellipsis; vertical-align: middle; white-space: nowrap; + &.rectangular { + --chip-radius: .2rem; + --chip-padding: .2rem .3rem; + } + .avatar { margin-left: -.4rem; margin-right: .2rem; diff --git a/server/controllers/api/videos/abuse.ts b/server/controllers/api/videos/abuse.ts index ff34da9d6be..90f0f16243b 100644 --- a/server/controllers/api/videos/abuse.ts +++ b/server/controllers/api/videos/abuse.ts @@ -1,5 +1,5 @@ import * as express from 'express' -import { UserRight, VideoAbuseCreate, VideoAbuseState, VideoAbuse } from '../../../../shared' +import { UserRight, VideoAbuseCreate, VideoAbuseState, VideoAbuse, VideoAbusePredefinedReasonsMap } from '../../../../shared' import { logger } from '../../../helpers/logger' import { getFormattedObjects } from '../../../helpers/utils' import { sequelizeTypescript } from '../../../initializers/database' @@ -25,8 +25,6 @@ import { sendVideoAbuse } from '../../../lib/activitypub/send/send-flag' import { MVideoAbuseAccountVideo } from '../../../types/models/video' import { getServerActor } from '@server/models/application/application' import { MAccountDefault } from '@server/types/models' -import { keys, pickBy } from 'lodash' -import { VideoAbusePredefinedReasonsIn } from '@shared/models/videos/abuse/video-abuse-reason.model' const auditLogger = auditLoggerFactory('abuse') const abuseVideoRouter = express.Router() @@ -76,7 +74,7 @@ async function listVideoAbuses (req: express.Request, res: express.Response) { count: req.query.count, sort: req.query.sort, id: req.query.id, - predefinedReasonId: req.query.predefinedReasonId, + predefinedReason: req.query.predefinedReason, search: req.query.search, state: req.query.state, videoIs: req.query.videoIs, @@ -126,7 +124,7 @@ async function reportVideoAbuse (req: express.Request, res: express.Response) { const videoAbuseInstance = await sequelizeTypescript.transaction(async t => { reporterAccount = await AccountModel.load(res.locals.oauth.token.User.Account.id, t) - const predefinedReasons = body.predefinedReasons.map(r => VideoAbusePredefinedReasonsIn[r]) + const predefinedReasons = body.predefinedReasons?.map(r => VideoAbusePredefinedReasonsMap[r]) const abuseToCreate = { reporterAccountId: reporterAccount.id, diff --git a/server/helpers/custom-validators/video-abuses.ts b/server/helpers/custom-validators/video-abuses.ts index d3a83e040ad..061353b9ebd 100644 --- a/server/helpers/custom-validators/video-abuses.ts +++ b/server/helpers/custom-validators/video-abuses.ts @@ -1,10 +1,9 @@ import validator from 'validator' -import { keys } from 'lodash' import { CONSTRAINTS_FIELDS, VIDEO_ABUSE_STATES } from '../../initializers/constants' -import { exists } from './misc' +import { exists, isArray } from './misc' import { VideoAbuseVideoIs } from '@shared/models/videos/abuse/video-abuse-video-is.type' -import { VideoAbusePredefinedReasonsIn } from '@shared/models/videos/abuse/video-abuse-reason.model' +import { VideoAbusePredefinedReasonsString, VideoAbusePredefinedReasonsMap } from '@shared/models/videos/abuse/video-abuse-reason.model' const VIDEO_ABUSES_CONSTRAINTS_FIELDS = CONSTRAINTS_FIELDS.VIDEO_ABUSES @@ -12,8 +11,16 @@ function isVideoAbuseReasonValid (value: string) { return exists(value) && validator.isLength(value, VIDEO_ABUSES_CONSTRAINTS_FIELDS.REASON) } -function isVideoAbusePredefinedReasonsValid (value: VideoAbusePredefinedReasonsIn[]) { - return exists(value) && value.every(element => keys(VideoAbusePredefinedReasonsIn).includes(element)) +function isVideoAbusePredefinedReasonValid (value: VideoAbusePredefinedReasonsString) { + return exists(value) && value in VideoAbusePredefinedReasonsMap +} + +function isVideoAbusePredefinedReasonsValid (value: VideoAbusePredefinedReasonsString[]) { + return exists(value) && isArray(value) && value.every(v => v in VideoAbusePredefinedReasonsMap) +} + +function isVideoAbuseTimestampValid (value: number) { + return value === null || (exists(value) && validator.isInt('' + value, { min: 0 })) } function isVideoAbuseModerationCommentValid (value: string) { @@ -35,7 +42,9 @@ function isAbuseVideoIsValid (value: VideoAbuseVideoIs) { export { isVideoAbuseReasonValid, + isVideoAbusePredefinedReasonValid, isVideoAbusePredefinedReasonsValid, + isVideoAbuseTimestampValid, isVideoAbuseModerationCommentValid, isVideoAbuseStateValid, isAbuseVideoIsValid diff --git a/server/initializers/migrations/0515-video-abuse-reason-timestamps.ts b/server/initializers/migrations/0515-video-abuse-reason-timestamps.ts index 964a5f588b7..c583356171d 100644 --- a/server/initializers/migrations/0515-video-abuse-reason-timestamps.ts +++ b/server/initializers/migrations/0515-video-abuse-reason-timestamps.ts @@ -5,6 +5,11 @@ async function up (utils: { queryInterface: Sequelize.QueryInterface sequelize: Sequelize.Sequelize }): Promise { + await utils.queryInterface.addColumn('videoAbuse', 'predefinedReasons', { + type: Sequelize.ARRAY(Sequelize.INTEGER), + allowNull: true + }) + await utils.queryInterface.addColumn('videoAbuse', 'startAt', { type: Sequelize.INTEGER, allowNull: true diff --git a/server/lib/activitypub/process/process-flag.ts b/server/lib/activitypub/process/process-flag.ts index 7de75d7962a..42a86c120db 100644 --- a/server/lib/activitypub/process/process-flag.ts +++ b/server/lib/activitypub/process/process-flag.ts @@ -1,4 +1,9 @@ -import { ActivityCreate, ActivityFlag, VideoAbuseState } from '../../../../shared' +import { + ActivityCreate, + ActivityFlag, + VideoAbuseState, + VideoAbusePredefinedReasonsMap +} from '../../../../shared' import { VideoAbuseObject } from '../../../../shared/models/activitypub/objects' import { retryTransactionWrapper } from '../../../helpers/database-utils' import { logger } from '../../../helpers/logger' @@ -39,7 +44,7 @@ async function processCreateVideoAbuse (activity: ActivityCreate | ActivityFlag, const { video } = await getOrCreateVideoAndAccountAndChannel({ videoObject: object }) const reporterAccount = await sequelizeTypescript.transaction(async t => AccountModel.load(account.id, t)) const tags = Array.isArray(flag.tag) ? flag.tag : [] - const predefinedReasons = tags.map(tag => parseInt(tag.name, 10)) + const predefinedReasons = tags.map(tag => VideoAbusePredefinedReasonsMap[tag.name]) .filter(v => !isNaN(v)) const startAt = flag.startAt const endAt = flag.endAt diff --git a/server/middlewares/validators/videos/video-abuses.ts b/server/middlewares/validators/videos/video-abuses.ts index d0b2f7f0336..33bd4a91239 100644 --- a/server/middlewares/validators/videos/video-abuses.ts +++ b/server/middlewares/validators/videos/video-abuses.ts @@ -6,7 +6,9 @@ import { isVideoAbuseModerationCommentValid, isVideoAbuseReasonValid, isVideoAbuseStateValid, - isVideoAbusePredefinedReasonsValid + isVideoAbusePredefinedReasonsValid, + isVideoAbusePredefinedReasonValid, + isVideoAbuseTimestampValid } from '../../../helpers/custom-validators/video-abuses' import { logger } from '../../../helpers/logger' import { doesVideoAbuseExist, doesVideoExist } from '../../../helpers/middlewares' @@ -27,11 +29,13 @@ const videoAbuseReportValidator = [ .withMessage('Should have a valid list of predefined reasons'), body('startAt') .optional() - .custom(toIntOrNull) + .customSanitizer(toIntOrNull) + .custom(isVideoAbuseTimestampValid) .withMessage('Should have valid starting time value'), body('endAt') .optional() - .custom(toIntOrNull) + .customSanitizer(toIntOrNull) + .custom(isVideoAbuseTimestampValid) .withMessage('Should have valid ending time value'), async (req: express.Request, res: express.Response, next: express.NextFunction) => { @@ -82,9 +86,10 @@ const videoAbuseListValidator = [ query('id') .optional() .custom(isIdValid).withMessage('Should have a valid id'), - query('predefinedReasonId') + query('predefinedReason') .optional() - .custom(isIdValid).withMessage('Should have a valid predefinedReasonId'), + .custom(isVideoAbusePredefinedReasonValid) + .withMessage('Should have a valid predefinedReason'), query('search') .optional() .custom(exists).withMessage('Should have a valid search'), diff --git a/server/models/video/video-abuse.ts b/server/models/video/video-abuse.ts index 7579b575a3b..9c6e0317592 100644 --- a/server/models/video/video-abuse.ts +++ b/server/models/video/video-abuse.ts @@ -15,7 +15,13 @@ import { UpdatedAt } from 'sequelize-typescript' import { VideoAbuseVideoIs } from '@shared/models/videos/abuse/video-abuse-video-is.type' -import { VideoAbuseState, VideoDetails } from '../../../shared' +import { + VideoAbuseState, + VideoDetails, + VideoAbusePredefinedReasons, + VideoAbusePredefinedReasonsString, + VideoAbusePredefinedReasonsMap +} from '../../../shared' import { VideoAbuseObject } from '../../../shared/models/activitypub/objects' import { VideoAbuse } from '../../../shared/models/videos' import { @@ -31,6 +37,7 @@ import { ThumbnailModel } from './thumbnail' import { VideoModel } from './video' import { VideoBlacklistModel } from './video-blacklist' import { ScopeNames as VideoChannelScopeNames, SummaryOptions, VideoChannelModel } from './video-channel' +import { invert } from 'lodash' export enum ScopeNames { FOR_API = 'FOR_API' @@ -270,7 +277,7 @@ export class VideoAbuseModel extends Model { @AllowNull(true) @Default(null) @Column(DataType.ARRAY(DataType.INTEGER)) - predefinedReasons: number[] + predefinedReasons: VideoAbusePredefinedReasons[] @AllowNull(true) @Default(null) @@ -335,7 +342,7 @@ export class VideoAbuseModel extends Model { user?: MUserAccountId id?: number - predefinedReasonId?: number + predefinedReason?: VideoAbusePredefinedReasonsString state?: VideoAbuseState videoIs?: VideoAbuseVideoIs @@ -354,7 +361,7 @@ export class VideoAbuseModel extends Model { serverAccountId, state, videoIs, - predefinedReasonId, + predefinedReason, searchReportee, searchVideo, searchVideoChannel, @@ -363,6 +370,7 @@ export class VideoAbuseModel extends Model { } = parameters const userAccountId = user ? user.Account.id : undefined + const predefinedReasonId = predefinedReason ? VideoAbusePredefinedReasonsMap[predefinedReason] : undefined const query = { offset: start, @@ -397,6 +405,7 @@ export class VideoAbuseModel extends Model { } toFormattedJSON (this: MVideoAbuseFormattable): VideoAbuse { + const predefinedReasons = VideoAbuseModel.getPredefinedReasonsStrings(this.predefinedReasons || []) const countReportsForVideo = this.get('countReportsForVideo') as number const nthReportForVideo = this.get('nthReportForVideo') as number const countReportsForReporterVideo = this.get('countReportsForReporter__video') as number @@ -411,7 +420,7 @@ export class VideoAbuseModel extends Model { return { id: this.id, reason: this.reason, - predefinedReasons: this.predefinedReasons, + predefinedReasons, reporterAccount: this.Account.toFormattedJSON(), state: { id: this.state, @@ -440,6 +449,8 @@ export class VideoAbuseModel extends Model { } toActivityPubObject (this: MVideoAbuseVideo): VideoAbuseObject { + const predefinedReasons = VideoAbuseModel.getPredefinedReasonsStrings(this.predefinedReasons || []) + const startAt = this.startAt const endAt = this.endAt @@ -447,9 +458,9 @@ export class VideoAbuseModel extends Model { type: 'Flag' as 'Flag', content: this.reason, object: this.Video.url, - tag: this.predefinedReasons.map(r => ({ + tag: predefinedReasons.map(r => ({ type: 'Hashtag' as 'Hashtag', - name: r.toString() + name: r })), startAt, endAt @@ -459,4 +470,10 @@ export class VideoAbuseModel extends Model { private static getStateLabel (id: number) { return VIDEO_ABUSE_STATES[id] || 'Unknown' } + + private static getPredefinedReasonsStrings (predefinedReasons: VideoAbusePredefinedReasons[]): VideoAbusePredefinedReasonsString[] { + return predefinedReasons + .filter(r => r in VideoAbusePredefinedReasons) + .map(r => invert(VideoAbusePredefinedReasonsMap)[r] as VideoAbusePredefinedReasonsString) + } } diff --git a/server/tests/api/videos/video-abuse.ts b/server/tests/api/videos/video-abuse.ts index a96be97f636..d8706502548 100644 --- a/server/tests/api/videos/video-abuse.ts +++ b/server/tests/api/videos/video-abuse.ts @@ -2,7 +2,7 @@ import * as chai from 'chai' import 'mocha' -import { VideoAbuse, VideoAbuseState } from '../../../../shared/models/videos' +import { VideoAbuse, VideoAbuseState, VideoAbusePredefinedReasonsString } from '../../../../shared/models/videos' import { cleanupTests, deleteVideoAbuse, @@ -291,6 +291,33 @@ describe('Test video abuses', function () { } }) + it('Should list predefined reasons as well as timestamps for the reported video', async function () { + this.timeout(10000) + + const reason5 = 'my super bad reason 5' + const predefinedReasons5: VideoAbusePredefinedReasonsString[] = [ 'violentOrRepulsive', 'captions' ] + const createdAbuse = (await reportVideoAbuse( + servers[0].url, + servers[0].accessToken, + servers[0].video.id, + reason5, + predefinedReasons5, + 1, + 5 + )).body as VideoAbuse + + const res = await getVideoAbusesList({ url: servers[0].url, token: servers[0].accessToken }) + + for (const abuse of res.body.data as VideoAbuse[]) { + if (abuse.id === createdAbuse.id) { + expect(abuse.reason).to.equals(reason5) + expect(abuse.predefinedReasons).to.equals(predefinedReasons5, "predefined reasons do not match the one reported") + expect(abuse.startAt).to.equal(1, "starting timestamp doesn't match the one reported") + expect(abuse.endAt).to.equal(5, "ending timestamp doesn't match the one reported") + } + } + }) + it('Should delete the video abuse', async function () { this.timeout(10000) @@ -307,7 +334,7 @@ describe('Test video abuses', function () { { const res = await getVideoAbusesList({ url: servers[0].url, token: servers[0].accessToken }) - expect(res.body.total).to.equal(5) + expect(res.body.total).to.equal(6) } }) @@ -328,25 +355,28 @@ describe('Test video abuses', function () { expect(await list({ id: 56 })).to.have.lengthOf(0) expect(await list({ id: 1 })).to.have.lengthOf(1) - expect(await list({ search: 'my super name for server 1' })).to.have.lengthOf(3) + expect(await list({ search: 'my super name for server 1' })).to.have.lengthOf(4) expect(await list({ search: 'aaaaaaaaaaaaaaaaaaaaaaaaaa' })).to.have.lengthOf(0) expect(await list({ searchVideo: 'my second super name for server 1' })).to.have.lengthOf(1) - expect(await list({ searchVideoChannel: 'root' })).to.have.lengthOf(3) + expect(await list({ searchVideoChannel: 'root' })).to.have.lengthOf(4) expect(await list({ searchVideoChannel: 'aaaa' })).to.have.lengthOf(0) expect(await list({ searchReporter: 'user2' })).to.have.lengthOf(1) - expect(await list({ searchReporter: 'root' })).to.have.lengthOf(4) + expect(await list({ searchReporter: 'root' })).to.have.lengthOf(5) - expect(await list({ searchReportee: 'root' })).to.have.lengthOf(3) + expect(await list({ searchReportee: 'root' })).to.have.lengthOf(4) expect(await list({ searchReportee: 'aaaa' })).to.have.lengthOf(0) expect(await list({ videoIs: 'deleted' })).to.have.lengthOf(1) expect(await list({ videoIs: 'blacklisted' })).to.have.lengthOf(0) expect(await list({ state: VideoAbuseState.ACCEPTED })).to.have.lengthOf(0) - expect(await list({ state: VideoAbuseState.PENDING })).to.have.lengthOf(5) + expect(await list({ state: VideoAbuseState.PENDING })).to.have.lengthOf(6) + + expect(await list({ predefinedReason: 'violentOrRepulsive' })).to.have.lengthOf(1) + expect(await list({ predefinedReason: 'serverRules' })).to.have.lengthOf(0) }) after(async function () { diff --git a/shared/extra-utils/videos/video-abuses.ts b/shared/extra-utils/videos/video-abuses.ts index 81582bfc7fd..ff006672ad9 100644 --- a/shared/extra-utils/videos/video-abuses.ts +++ b/shared/extra-utils/videos/video-abuses.ts @@ -1,17 +1,26 @@ import * as request from 'supertest' import { VideoAbuseUpdate } from '../../models/videos/abuse/video-abuse-update.model' import { makeDeleteRequest, makePutBodyRequest, makeGetRequest } from '../requests/requests' -import { VideoAbuseState } from '@shared/models' +import { VideoAbuseState, VideoAbusePredefinedReasonsString } from '@shared/models' import { VideoAbuseVideoIs } from '@shared/models/videos/abuse/video-abuse-video-is.type' -function reportVideoAbuse (url: string, token: string, videoId: number | string, reason: string, specialStatus = 200) { +function reportVideoAbuse ( + url: string, + token: string, + videoId: number | string, + reason: string, + predefinedReasons?: VideoAbusePredefinedReasonsString[], + startAt?: number, + endAt?: number, + specialStatus = 200 +) { const path = '/api/v1/videos/' + videoId + '/abuse' return request(url) .post(path) .set('Accept', 'application/json') .set('Authorization', 'Bearer ' + token) - .send({ reason }) + .send({ reason, predefinedReasons, startAt, endAt }) .expect(specialStatus) } @@ -19,6 +28,7 @@ function getVideoAbusesList (options: { url: string token: string id?: number + predefinedReason?: VideoAbusePredefinedReasonsString search?: string state?: VideoAbuseState videoIs?: VideoAbuseVideoIs @@ -31,6 +41,7 @@ function getVideoAbusesList (options: { url, token, id, + predefinedReason, search, state, videoIs, @@ -44,6 +55,7 @@ function getVideoAbusesList (options: { const query = { sort: 'createdAt', id, + predefinedReason, search, state, videoIs, diff --git a/shared/models/activitypub/objects/common-objects.ts b/shared/models/activitypub/objects/common-objects.ts index 704979e5940..096d422eab1 100644 --- a/shared/models/activitypub/objects/common-objects.ts +++ b/shared/models/activitypub/objects/common-objects.ts @@ -1,3 +1,5 @@ +import { VideoAbusePredefinedReasonsString } from '@shared/models/videos' + export interface ActivityIdentifierObject { identifier: string name: string @@ -83,7 +85,7 @@ export interface ActivityMentionObject { export interface ActivityFlagReasonObject { type: 'Hashtag' - name: string + name: VideoAbusePredefinedReasonsString } export type ActivityTagObject = diff --git a/shared/models/videos/abuse/video-abuse-create.model.ts b/shared/models/videos/abuse/video-abuse-create.model.ts index 54f3637b585..c93cb8b2c42 100644 --- a/shared/models/videos/abuse/video-abuse-create.model.ts +++ b/shared/models/videos/abuse/video-abuse-create.model.ts @@ -1,8 +1,8 @@ -import { VideoAbusePredefinedReasonsIn } from './video-abuse-reason.model' +import { VideoAbusePredefinedReasonsString } from './video-abuse-reason.model' export interface VideoAbuseCreate { reason: string - predefinedReasons?: VideoAbusePredefinedReasonsIn[] + predefinedReasons?: VideoAbusePredefinedReasonsString[] startAt?: number endAt?: number } diff --git a/shared/models/videos/abuse/video-abuse-reason.model.ts b/shared/models/videos/abuse/video-abuse-reason.model.ts index 8dd473227b1..e514471b9dc 100644 --- a/shared/models/videos/abuse/video-abuse-reason.model.ts +++ b/shared/models/videos/abuse/video-abuse-reason.model.ts @@ -1,5 +1,5 @@ export enum VideoAbusePredefinedReasons { - VIOLENT_OR_REPULSIVE, + VIOLENT_OR_REPULSIVE = 1, HATEFUL_OR_ABUSIVE, SPAM_OR_MISLEADING, PRIVACY, @@ -9,7 +9,7 @@ export enum VideoAbusePredefinedReasons { CAPTIONS } -export type VideoAbusePredefinedReasonsIn = +export type VideoAbusePredefinedReasonsString = 'violentOrRepulsive' | 'hatefulOrAbusive' | 'spamOrMisleading' | @@ -19,7 +19,9 @@ export type VideoAbusePredefinedReasonsIn = 'thumbnails' | 'captions' -export const VideoAbusePredefinedReasonsIn = { +export const VideoAbusePredefinedReasonsMap: { + [key in VideoAbusePredefinedReasonsString]: VideoAbusePredefinedReasons +} = { violentOrRepulsive: VideoAbusePredefinedReasons.VIOLENT_OR_REPULSIVE, hatefulOrAbusive: VideoAbusePredefinedReasons.HATEFUL_OR_ABUSIVE, spamOrMisleading: VideoAbusePredefinedReasons.SPAM_OR_MISLEADING, diff --git a/shared/models/videos/abuse/video-abuse.model.ts b/shared/models/videos/abuse/video-abuse.model.ts index e948859771e..38605dcac05 100644 --- a/shared/models/videos/abuse/video-abuse.model.ts +++ b/shared/models/videos/abuse/video-abuse.model.ts @@ -2,11 +2,12 @@ import { Account } from '../../actors/index' import { VideoConstant } from '../video-constant.model' import { VideoAbuseState } from './video-abuse-state.model' import { VideoChannel } from '../channel/video-channel.model' +import { VideoAbusePredefinedReasonsString } from './video-abuse-reason.model' export interface VideoAbuse { id: number reason: string - predefinedReasons?: number[] + predefinedReasons?: VideoAbusePredefinedReasonsString[] reporterAccount: Account state: VideoConstant From 51718ed6f2b2c6dcca1bd87210afb06c2b53acb7 Mon Sep 17 00:00:00 2001 From: Rigel Kent Date: Mon, 22 Jun 2020 11:20:03 +0200 Subject: [PATCH 9/9] fix video-abuse tests and check timestamp coherence --- .../video/modals/video-report.component.ts | 4 +-- server/controllers/api/videos/abuse.ts | 4 +-- .../helpers/custom-validators/video-abuses.ts | 11 +++++-- .../lib/activitypub/process/process-flag.ts | 4 +-- .../validators/videos/video-abuses.ts | 8 +++-- server/models/video/video-abuse.ts | 12 ++++---- server/tests/api/check-params/video-abuses.ts | 30 +++++++++++++++++-- server/tests/api/videos/video-abuse.ts | 15 +++++----- .../videos/abuse/video-abuse-reason.model.ts | 2 +- support/doc/api/openapi.yaml | 6 ++++ 10 files changed, 67 insertions(+), 29 deletions(-) diff --git a/client/src/app/shared/video/modals/video-report.component.ts b/client/src/app/shared/video/modals/video-report.component.ts index 0a01a4a179a..c2d441bba29 100644 --- a/client/src/app/shared/video/modals/video-report.component.ts +++ b/client/src/app/shared/video/modals/video-report.component.ts @@ -10,7 +10,7 @@ import { VideoAbuseService } from '@app/shared/video-abuse' import { Video } from '@app/shared/video/video.model' import { buildVideoEmbed, buildVideoLink } from 'src/assets/player/utils' import { DomSanitizer, SafeHtml } from '@angular/platform-browser' -import { VideoAbusePredefinedReasonsString, VideoAbusePredefinedReasonsMap } from '@shared/models/videos/abuse/video-abuse-reason.model' +import { VideoAbusePredefinedReasonsString, videoAbusePredefinedReasonsMap } from '@shared/models/videos/abuse/video-abuse-reason.model' import { mapValues, pickBy } from 'lodash-es' @Component({ @@ -72,7 +72,7 @@ export class VideoReportComponent extends FormReactive implements OnInit { ngOnInit () { this.buildForm({ reason: this.videoAbuseValidatorsService.VIDEO_ABUSE_REASON, - predefinedReasons: mapValues(VideoAbusePredefinedReasonsMap, r => null), + predefinedReasons: mapValues(videoAbusePredefinedReasonsMap, r => null), timestamp: { hasStart: null, startAt: null, diff --git a/server/controllers/api/videos/abuse.ts b/server/controllers/api/videos/abuse.ts index 90f0f16243b..ab207445950 100644 --- a/server/controllers/api/videos/abuse.ts +++ b/server/controllers/api/videos/abuse.ts @@ -1,5 +1,5 @@ import * as express from 'express' -import { UserRight, VideoAbuseCreate, VideoAbuseState, VideoAbuse, VideoAbusePredefinedReasonsMap } from '../../../../shared' +import { UserRight, VideoAbuseCreate, VideoAbuseState, VideoAbuse, videoAbusePredefinedReasonsMap } from '../../../../shared' import { logger } from '../../../helpers/logger' import { getFormattedObjects } from '../../../helpers/utils' import { sequelizeTypescript } from '../../../initializers/database' @@ -124,7 +124,7 @@ async function reportVideoAbuse (req: express.Request, res: express.Response) { const videoAbuseInstance = await sequelizeTypescript.transaction(async t => { reporterAccount = await AccountModel.load(res.locals.oauth.token.User.Account.id, t) - const predefinedReasons = body.predefinedReasons?.map(r => VideoAbusePredefinedReasonsMap[r]) + const predefinedReasons = body.predefinedReasons?.map(r => videoAbusePredefinedReasonsMap[r]) const abuseToCreate = { reporterAccountId: reporterAccount.id, diff --git a/server/helpers/custom-validators/video-abuses.ts b/server/helpers/custom-validators/video-abuses.ts index 061353b9ebd..0c2c342681e 100644 --- a/server/helpers/custom-validators/video-abuses.ts +++ b/server/helpers/custom-validators/video-abuses.ts @@ -3,7 +3,7 @@ import validator from 'validator' import { CONSTRAINTS_FIELDS, VIDEO_ABUSE_STATES } from '../../initializers/constants' import { exists, isArray } from './misc' import { VideoAbuseVideoIs } from '@shared/models/videos/abuse/video-abuse-video-is.type' -import { VideoAbusePredefinedReasonsString, VideoAbusePredefinedReasonsMap } from '@shared/models/videos/abuse/video-abuse-reason.model' +import { VideoAbusePredefinedReasonsString, videoAbusePredefinedReasonsMap } from '@shared/models/videos/abuse/video-abuse-reason.model' const VIDEO_ABUSES_CONSTRAINTS_FIELDS = CONSTRAINTS_FIELDS.VIDEO_ABUSES @@ -12,17 +12,21 @@ function isVideoAbuseReasonValid (value: string) { } function isVideoAbusePredefinedReasonValid (value: VideoAbusePredefinedReasonsString) { - return exists(value) && value in VideoAbusePredefinedReasonsMap + return exists(value) && value in videoAbusePredefinedReasonsMap } function isVideoAbusePredefinedReasonsValid (value: VideoAbusePredefinedReasonsString[]) { - return exists(value) && isArray(value) && value.every(v => v in VideoAbusePredefinedReasonsMap) + return exists(value) && isArray(value) && value.every(v => v in videoAbusePredefinedReasonsMap) } function isVideoAbuseTimestampValid (value: number) { return value === null || (exists(value) && validator.isInt('' + value, { min: 0 })) } +function isVideoAbuseTimestampCoherent (endAt: number, { req }) { + return exists(req.body.startAt) && endAt > req.body.startAt +} + function isVideoAbuseModerationCommentValid (value: string) { return exists(value) && validator.isLength(value, VIDEO_ABUSES_CONSTRAINTS_FIELDS.MODERATION_COMMENT) } @@ -45,6 +49,7 @@ export { isVideoAbusePredefinedReasonValid, isVideoAbusePredefinedReasonsValid, isVideoAbuseTimestampValid, + isVideoAbuseTimestampCoherent, isVideoAbuseModerationCommentValid, isVideoAbuseStateValid, isAbuseVideoIsValid diff --git a/server/lib/activitypub/process/process-flag.ts b/server/lib/activitypub/process/process-flag.ts index 42a86c120db..1d7132a3a70 100644 --- a/server/lib/activitypub/process/process-flag.ts +++ b/server/lib/activitypub/process/process-flag.ts @@ -2,7 +2,7 @@ import { ActivityCreate, ActivityFlag, VideoAbuseState, - VideoAbusePredefinedReasonsMap + videoAbusePredefinedReasonsMap } from '../../../../shared' import { VideoAbuseObject } from '../../../../shared/models/activitypub/objects' import { retryTransactionWrapper } from '../../../helpers/database-utils' @@ -44,7 +44,7 @@ async function processCreateVideoAbuse (activity: ActivityCreate | ActivityFlag, const { video } = await getOrCreateVideoAndAccountAndChannel({ videoObject: object }) const reporterAccount = await sequelizeTypescript.transaction(async t => AccountModel.load(account.id, t)) const tags = Array.isArray(flag.tag) ? flag.tag : [] - const predefinedReasons = tags.map(tag => VideoAbusePredefinedReasonsMap[tag.name]) + const predefinedReasons = tags.map(tag => videoAbusePredefinedReasonsMap[tag.name]) .filter(v => !isNaN(v)) const startAt = flag.startAt const endAt = flag.endAt diff --git a/server/middlewares/validators/videos/video-abuses.ts b/server/middlewares/validators/videos/video-abuses.ts index 33bd4a91239..5bbd1e3c60e 100644 --- a/server/middlewares/validators/videos/video-abuses.ts +++ b/server/middlewares/validators/videos/video-abuses.ts @@ -8,7 +8,8 @@ import { isVideoAbuseStateValid, isVideoAbusePredefinedReasonsValid, isVideoAbusePredefinedReasonValid, - isVideoAbuseTimestampValid + isVideoAbuseTimestampValid, + isVideoAbuseTimestampCoherent } from '../../../helpers/custom-validators/video-abuses' import { logger } from '../../../helpers/logger' import { doesVideoAbuseExist, doesVideoExist } from '../../../helpers/middlewares' @@ -36,7 +37,10 @@ const videoAbuseReportValidator = [ .optional() .customSanitizer(toIntOrNull) .custom(isVideoAbuseTimestampValid) - .withMessage('Should have valid ending time value'), + .withMessage('Should have valid ending time value') + .bail() + .custom(isVideoAbuseTimestampCoherent) + .withMessage('Should have a startAt timestamp beginning before endAt'), async (req: express.Request, res: express.Response, next: express.NextFunction) => { logger.debug('Checking videoAbuseReport parameters', { parameters: req.body }) diff --git a/server/models/video/video-abuse.ts b/server/models/video/video-abuse.ts index 9c6e0317592..1319332f073 100644 --- a/server/models/video/video-abuse.ts +++ b/server/models/video/video-abuse.ts @@ -20,7 +20,7 @@ import { VideoDetails, VideoAbusePredefinedReasons, VideoAbusePredefinedReasonsString, - VideoAbusePredefinedReasonsMap + videoAbusePredefinedReasonsMap } from '../../../shared' import { VideoAbuseObject } from '../../../shared/models/activitypub/objects' import { VideoAbuse } from '../../../shared/models/videos' @@ -370,7 +370,7 @@ export class VideoAbuseModel extends Model { } = parameters const userAccountId = user ? user.Account.id : undefined - const predefinedReasonId = predefinedReason ? VideoAbusePredefinedReasonsMap[predefinedReason] : undefined + const predefinedReasonId = predefinedReason ? videoAbusePredefinedReasonsMap[predefinedReason] : undefined const query = { offset: start, @@ -405,7 +405,7 @@ export class VideoAbuseModel extends Model { } toFormattedJSON (this: MVideoAbuseFormattable): VideoAbuse { - const predefinedReasons = VideoAbuseModel.getPredefinedReasonsStrings(this.predefinedReasons || []) + const predefinedReasons = VideoAbuseModel.getPredefinedReasonsStrings(this.predefinedReasons) const countReportsForVideo = this.get('countReportsForVideo') as number const nthReportForVideo = this.get('nthReportForVideo') as number const countReportsForReporterVideo = this.get('countReportsForReporter__video') as number @@ -449,7 +449,7 @@ export class VideoAbuseModel extends Model { } toActivityPubObject (this: MVideoAbuseVideo): VideoAbuseObject { - const predefinedReasons = VideoAbuseModel.getPredefinedReasonsStrings(this.predefinedReasons || []) + const predefinedReasons = VideoAbuseModel.getPredefinedReasonsStrings(this.predefinedReasons) const startAt = this.startAt const endAt = this.endAt @@ -472,8 +472,8 @@ export class VideoAbuseModel extends Model { } private static getPredefinedReasonsStrings (predefinedReasons: VideoAbusePredefinedReasons[]): VideoAbusePredefinedReasonsString[] { - return predefinedReasons + return (predefinedReasons || []) .filter(r => r in VideoAbusePredefinedReasons) - .map(r => invert(VideoAbusePredefinedReasonsMap)[r] as VideoAbusePredefinedReasonsString) + .map(r => invert(videoAbusePredefinedReasonsMap)[r] as VideoAbusePredefinedReasonsString) } } diff --git a/server/tests/api/check-params/video-abuses.ts b/server/tests/api/check-params/video-abuses.ts index a3fe00ffbdf..557bf20eb41 100644 --- a/server/tests/api/check-params/video-abuses.ts +++ b/server/tests/api/check-params/video-abuses.ts @@ -20,7 +20,7 @@ import { checkBadSortPagination, checkBadStartPagination } from '../../../../shared/extra-utils/requests/check-api-params' -import { VideoAbuseState } from '../../../../shared/models/videos' +import { VideoAbuseState, VideoAbuseCreate } from '../../../../shared/models/videos' describe('Test video abuses API validators', function () { let server: ServerInfo @@ -132,12 +132,36 @@ describe('Test video abuses API validators', function () { await makePostBodyRequest({ url: server.url, path, token: server.accessToken, fields }) }) - it('Should succeed with the correct parameters', async function () { - const fields = { reason: 'super reason' } + it('Should succeed with the correct parameters (basic)', async function () { + const fields = { reason: 'my super reason' } const res = await makePostBodyRequest({ url: server.url, path, token: server.accessToken, fields, statusCodeExpected: 200 }) videoAbuseId = res.body.videoAbuse.id }) + + it('Should fail with a wrong predefined reason', async function () { + const fields = { reason: 'my super reason', predefinedReasons: [ 'wrongPredefinedReason' ] } + + await makePostBodyRequest({ url: server.url, path, token: server.accessToken, fields }) + }) + + it('Should fail with negative timestamps', async function () { + const fields = { reason: 'my super reason', startAt: -1 } + + await makePostBodyRequest({ url: server.url, path, token: server.accessToken, fields }) + }) + + it('Should fail mith misordered startAt/endAt', async function () { + const fields = { reason: 'my super reason', startAt: 5, endAt: 1 } + + await makePostBodyRequest({ url: server.url, path, token: server.accessToken, fields }) + }) + + it('Should succeed with the corret parameters (advanced)', async function () { + const fields: VideoAbuseCreate = { reason: 'my super reason', predefinedReasons: [ 'serverRules' ], startAt: 1, endAt: 5 } + + await makePostBodyRequest({ url: server.url, path, token: server.accessToken, fields, statusCodeExpected: 200 }) + }) }) describe('When updating a video abuse', function () { diff --git a/server/tests/api/videos/video-abuse.ts b/server/tests/api/videos/video-abuse.ts index d8706502548..7383bd991c5 100644 --- a/server/tests/api/videos/video-abuse.ts +++ b/server/tests/api/videos/video-abuse.ts @@ -304,17 +304,16 @@ describe('Test video abuses', function () { predefinedReasons5, 1, 5 - )).body as VideoAbuse + )).body.videoAbuse as VideoAbuse const res = await getVideoAbusesList({ url: servers[0].url, token: servers[0].accessToken }) - for (const abuse of res.body.data as VideoAbuse[]) { - if (abuse.id === createdAbuse.id) { - expect(abuse.reason).to.equals(reason5) - expect(abuse.predefinedReasons).to.equals(predefinedReasons5, "predefined reasons do not match the one reported") - expect(abuse.startAt).to.equal(1, "starting timestamp doesn't match the one reported") - expect(abuse.endAt).to.equal(5, "ending timestamp doesn't match the one reported") - } + { + const abuse = (res.body.data as VideoAbuse[]).find(a => a.id === createdAbuse.id) + expect(abuse.reason).to.equals(reason5) + expect(abuse.predefinedReasons).to.deep.equals(predefinedReasons5, "predefined reasons do not match the one reported") + expect(abuse.startAt).to.equal(1, "starting timestamp doesn't match the one reported") + expect(abuse.endAt).to.equal(5, "ending timestamp doesn't match the one reported") } }) diff --git a/shared/models/videos/abuse/video-abuse-reason.model.ts b/shared/models/videos/abuse/video-abuse-reason.model.ts index e514471b9dc..9064f0c1ae1 100644 --- a/shared/models/videos/abuse/video-abuse-reason.model.ts +++ b/shared/models/videos/abuse/video-abuse-reason.model.ts @@ -19,7 +19,7 @@ export type VideoAbusePredefinedReasonsString = 'thumbnails' | 'captions' -export const VideoAbusePredefinedReasonsMap: { +export const videoAbusePredefinedReasonsMap: { [key in VideoAbusePredefinedReasonsString]: VideoAbusePredefinedReasons } = { violentOrRepulsive: VideoAbusePredefinedReasons.VIOLENT_OR_REPULSIVE, diff --git a/support/doc/api/openapi.yaml b/support/doc/api/openapi.yaml index 35891877d60..9434af90490 100644 --- a/support/doc/api/openapi.yaml +++ b/support/doc/api/openapi.yaml @@ -1268,6 +1268,12 @@ paths: - serverRules - thumbnails - captions + startAt: + type: number + description: Timestamp in the video that marks the beginning of the report + endAt: + type: number + description: Timestamp in the video that marks the ending of the report required: - reason responses: