Use 3 tables to represent abuses

2 files changed, 13 insertions, 7 deletions

diff --git a/server/helpers/middlewares/video-abuses.ts b/server/helpers/middlewares/abuses.ts
index 97a5724b6..3906f6760 100644
--- a/server/helpers/middlewares/video-abuses.ts
+++ b/server/helpers/middlewares/abuses.ts
@@ -1,19 +1,20 @@
 import { Response } from 'express'
-import { VideoAbuseModel } from '../../models/video/video-abuse'
+import { AbuseModel } from '../../models/abuse/abuse'
 import { fetchVideo } from '../video'
 
+// FIXME: deprecated in 2.3. Remove this function
 async function doesVideoAbuseExist (abuseIdArg: number | string, videoUUID: string, res: Response) {
   const abuseId = parseInt(abuseIdArg + '', 10)
-  let videoAbuse = await VideoAbuseModel.loadByIdAndVideoId(abuseId, null, videoUUID)
+  let abuse = await AbuseModel.loadByIdAndVideoId(abuseId, null, videoUUID)
 
-  if (!videoAbuse) {
+  if (!abuse) {
     const userId = res.locals.oauth?.token.User.id
     const video = await fetchVideo(videoUUID, 'all', userId)
 
-    if (video) videoAbuse = await VideoAbuseModel.loadByIdAndVideoId(abuseId, video.id)
+    if (video) abuse = await AbuseModel.loadByIdAndVideoId(abuseId, video.id)
   }
 
-  if (videoAbuse === null) {
+  if (abuse === null) {
     res.status(404)
        .json({ error: 'Video abuse not found' })
        .end()
@@ -21,12 +22,17 @@ async function doesVideoAbuseExist (abuseIdArg: number | string, videoUUID: stri
     return false
   }
 
-  res.locals.videoAbuse = videoAbuse
+  res.locals.abuse = abuse
   return true
 }
 
+async function doesAbuseExist (abuseIdArg: number | string, videoUUID: string, res: Response) {
+
+}
+
 // ---------------------------------------------------------------------------
 
 export {
+  doesAbuseExist,
   doesVideoAbuseExist
 }
diff --git a/server/helpers/middlewares/index.ts b/server/helpers/middlewares/index.ts
index f91aeaa12..f57f3ad31 100644
--- a/server/helpers/middlewares/index.ts
+++ b/server/helpers/middlewares/index.ts
@@ -1,5 +1,5 @@
+export * from './abuses'
 export * from './accounts'
-export * from './video-abuses'
 export * from './video-blacklists'
 export * from './video-captions'
 export * from './video-channels'