From feb34f6b6b991046aab6a10df747b48fa4da07a7 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 6 May 2020 17:39:07 +0200 Subject: Use video abuse filters on client side --- shared/extra-utils/videos/video-abuses.ts | 55 ++++++++++++++++++---- .../videos/abuse/video-abuse-video-is.type.ts | 1 + 2 files changed, 47 insertions(+), 9 deletions(-) create mode 100644 shared/models/videos/abuse/video-abuse-video-is.type.ts (limited to 'shared') diff --git a/shared/extra-utils/videos/video-abuses.ts b/shared/extra-utils/videos/video-abuses.ts index 7f011ec0f..81582bfc7 100644 --- a/shared/extra-utils/videos/video-abuses.ts +++ b/shared/extra-utils/videos/video-abuses.ts @@ -1,6 +1,8 @@ import * as request from 'supertest' import { VideoAbuseUpdate } from '../../models/videos/abuse/video-abuse-update.model' -import { makeDeleteRequest, makePutBodyRequest } from '../requests/requests' +import { makeDeleteRequest, makePutBodyRequest, makeGetRequest } from '../requests/requests' +import { VideoAbuseState } 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) { const path = '/api/v1/videos/' + videoId + '/abuse' @@ -13,16 +15,51 @@ function reportVideoAbuse (url: string, token: string, videoId: number | string, .expect(specialStatus) } -function getVideoAbusesList (url: string, token: string) { +function getVideoAbusesList (options: { + url: string + token: string + id?: number + search?: string + state?: VideoAbuseState + videoIs?: VideoAbuseVideoIs + searchReporter?: string + searchReportee?: string + searchVideo?: string + searchVideoChannel?: string +}) { + const { + url, + token, + id, + search, + state, + videoIs, + searchReporter, + searchReportee, + searchVideo, + searchVideoChannel + } = options const path = '/api/v1/videos/abuse' - return request(url) - .get(path) - .query({ sort: 'createdAt' }) - .set('Accept', 'application/json') - .set('Authorization', 'Bearer ' + token) - .expect(200) - .expect('Content-Type', /json/) + const query = { + sort: 'createdAt', + id, + search, + state, + videoIs, + searchReporter, + searchReportee, + searchVideo, + searchVideoChannel + } + + return makeGetRequest({ + url, + path, + token, + query, + statusCodeExpected: 200 + }) } function updateVideoAbuse ( diff --git a/shared/models/videos/abuse/video-abuse-video-is.type.ts b/shared/models/videos/abuse/video-abuse-video-is.type.ts new file mode 100644 index 000000000..e86018993 --- /dev/null +++ b/shared/models/videos/abuse/video-abuse-video-is.type.ts @@ -0,0 +1 @@ +export type VideoAbuseVideoIs = 'deleted' | 'blacklisted' -- cgit v1.2.3