Refactor server errors handler

[github/Chocobozzz/PeerTube.git] / server / helpers / middlewares / abuses.ts

diff --git a/server/helpers/middlewares/abuses.ts b/server/helpers/middlewares/abuses.ts
index be8c8b449b574f166db2c3926ca64b1f2ec8d01d..f0b1caba84e55f8f2a212108910fb27bfd7cdc4d 100644 (file)
--- a/server/helpers/middlewares/abuses.ts
+++ b/server/helpers/middlewares/abuses.ts
@@ -1,36 +1,15 @@
 import { Response } from 'express'
 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 abuse = await AbuseModel.loadByIdAndVideoId(abuseId, null, videoUUID)
-
-  if (!abuse) {
-    const userId = res.locals.oauth?.token.User.id
-    const video = await fetchVideo(videoUUID, 'all', userId)
-
-    if (video) abuse = await AbuseModel.loadByIdAndVideoId(abuseId, video.id)
-  }
-
-  if (abuse === null) {
-    res.status(404)
-       .json({ error: 'Video abuse not found' })
-
-    return false
-  }
-
-  res.locals.abuse = abuse
-  return true
-}
+import { HttpStatusCode } from '../../../shared/core-utils/miscs/http-error-codes'
 
 async function doesAbuseExist (abuseId: number | string, res: Response) {
-  const abuse = await AbuseModel.loadById(parseInt(abuseId + '', 10))
+  const abuse = await AbuseModel.loadByIdWithReporter(parseInt(abuseId + '', 10))
 
   if (!abuse) {
-    res.status(404)
-       .json({ error: 'Abuse not found' })
+    res.fail({
+      status: HttpStatusCode.NOT_FOUND_404,
+      message: 'Abuse not found'
+    })
 
     return false
   }
@@ -42,6 +21,5 @@ async function doesAbuseExist (abuseId: number | string, res: Response) {
 // ---------------------------------------------------------------------------
 
 export {
-  doesAbuseExist,
-  doesVideoAbuseExist
+  doesAbuseExist
 }