From 7a4ea932461f228ae44a173ddcd48ffb088aa023 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Tue, 10 Nov 2020 14:41:20 +0100
Subject: Remove deprecated abuse api

---
 shared/extra-utils/index.ts                        |   1 -
 shared/extra-utils/videos/video-abuses.ts          | 114 ---------------------
 .../models/moderation/abuse/abuse-create.model.ts  |   8 --
 shared/models/moderation/abuse/abuse.model.ts      |  12 ---
 4 files changed, 135 deletions(-)
 delete mode 100644 shared/extra-utils/videos/video-abuses.ts

(limited to 'shared')

diff --git a/shared/extra-utils/index.ts b/shared/extra-utils/index.ts
index d118b12d2..8f5c709ff 100644
--- a/shared/extra-utils/index.ts
+++ b/shared/extra-utils/index.ts
@@ -19,7 +19,6 @@ export * from './users/accounts'
 export * from './moderation/abuses'
 export * from './videos/services'
 export * from './videos/live'
-export * from './videos/video-abuses'
 export * from './videos/video-blacklist'
 export * from './videos/video-captions'
 export * from './videos/video-channels'
diff --git a/shared/extra-utils/videos/video-abuses.ts b/shared/extra-utils/videos/video-abuses.ts
deleted file mode 100644
index 8827b8196..000000000
--- a/shared/extra-utils/videos/video-abuses.ts
+++ /dev/null
@@ -1,114 +0,0 @@
-import * as request from 'supertest'
-import { AbusePredefinedReasonsString, AbuseState, AbuseUpdate, AbuseVideoIs } from '@shared/models'
-import { makeDeleteRequest, makeGetRequest, makePutBodyRequest } from '../requests/requests'
-
-// FIXME: deprecated in 2.3. Remove this file
-
-function reportVideoAbuse (
-  url: string,
-  token: string,
-  videoId: number | string,
-  reason: string,
-  predefinedReasons?: AbusePredefinedReasonsString[],
-  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, predefinedReasons, startAt, endAt })
-          .expect(specialStatus)
-}
-
-function getVideoAbusesList (options: {
-  url: string
-  token: string
-  id?: number
-  predefinedReason?: AbusePredefinedReasonsString
-  search?: string
-  state?: AbuseState
-  videoIs?: AbuseVideoIs
-  searchReporter?: string
-  searchReportee?: string
-  searchVideo?: string
-  searchVideoChannel?: string
-}) {
-  const {
-    url,
-    token,
-    id,
-    predefinedReason,
-    search,
-    state,
-    videoIs,
-    searchReporter,
-    searchReportee,
-    searchVideo,
-    searchVideoChannel
-  } = options
-  const path = '/api/v1/videos/abuse'
-
-  const query = {
-    sort: 'createdAt',
-    id,
-    predefinedReason,
-    search,
-    state,
-    videoIs,
-    searchReporter,
-    searchReportee,
-    searchVideo,
-    searchVideoChannel
-  }
-
-  return makeGetRequest({
-    url,
-    path,
-    token,
-    query,
-    statusCodeExpected: 200
-  })
-}
-
-function updateVideoAbuse (
-  url: string,
-  token: string,
-  videoId: string | number,
-  videoAbuseId: number,
-  body: AbuseUpdate,
-  statusCodeExpected = 204
-) {
-  const path = '/api/v1/videos/' + videoId + '/abuse/' + videoAbuseId
-
-  return makePutBodyRequest({
-    url,
-    token,
-    path,
-    fields: body,
-    statusCodeExpected
-  })
-}
-
-function deleteVideoAbuse (url: string, token: string, videoId: string | number, videoAbuseId: number, statusCodeExpected = 204) {
-  const path = '/api/v1/videos/' + videoId + '/abuse/' + videoAbuseId
-
-  return makeDeleteRequest({
-    url,
-    token,
-    path,
-    statusCodeExpected
-  })
-}
-
-// ---------------------------------------------------------------------------
-
-export {
-  reportVideoAbuse,
-  getVideoAbusesList,
-  updateVideoAbuse,
-  deleteVideoAbuse
-}
diff --git a/shared/models/moderation/abuse/abuse-create.model.ts b/shared/models/moderation/abuse/abuse-create.model.ts
index b0358dbb9..0e7e9587f 100644
--- a/shared/models/moderation/abuse/abuse-create.model.ts
+++ b/shared/models/moderation/abuse/abuse-create.model.ts
@@ -19,11 +19,3 @@ export interface AbuseCreate {
     id: number
   }
 }
-
-// FIXME: deprecated in 2.3. Remove it
-export interface VideoAbuseCreate {
-  reason: string
-  predefinedReasons?: AbusePredefinedReasonsString[]
-  startAt?: number
-  endAt?: number
-}
diff --git a/shared/models/moderation/abuse/abuse.model.ts b/shared/models/moderation/abuse/abuse.model.ts
index 781870b1a..6048777ff 100644
--- a/shared/models/moderation/abuse/abuse.model.ts
+++ b/shared/models/moderation/abuse/abuse.model.ts
@@ -60,18 +60,6 @@ export interface AdminAbuse {
   countReportsForReportee?: number
 
   countMessages: number
-
-  // FIXME: deprecated in 2.3, remove the following properties
-
-  // @deprecated
-  startAt?: null
-  // @deprecated
-  endAt?: null
-
-  // @deprecated
-  count?: number
-  // @deprecated
-  nth?: number
 }
 
 export type UserVideoAbuse = Omit<AdminVideoAbuse, 'countReports' | 'nthReport'>
-- 
cgit v1.2.3