4 files changed, 50 insertions, 35 deletions

diff --git a/server/helpers/middlewares/abuses.ts b/server/helpers/middlewares/abuses.ts
new file mode 100644
index 000000000..be8c8b449
--- /dev/null
+++ b/server/helpers/middlewares/abuses.ts
@@ -0,0 +1,47 @@
+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
+}
+
+async function doesAbuseExist (abuseId: number | string, res: Response) {
+  const abuse = await AbuseModel.loadById(parseInt(abuseId + '', 10))
+
+  if (!abuse) {
+    res.status(404)
+       .json({ error: 'Abuse not found' })
+
+    return false
+  }
+
+  res.locals.abuse = abuse
+  return true
+}
+
+// ---------------------------------------------------------------------------
+
+export {
+  doesAbuseExist,
+  doesVideoAbuseExist
+}
diff --git a/server/helpers/middlewares/accounts.ts b/server/helpers/middlewares/accounts.ts
index bddea7eaa..29b4ed1a6 100644
--- a/server/helpers/middlewares/accounts.ts
+++ b/server/helpers/middlewares/accounts.ts
@@ -3,8 +3,8 @@ import { AccountModel } from '../../models/account/account'
 import * as Bluebird from 'bluebird'
 import { MAccountDefault } from '../../types/models'
 
-function doesAccountIdExist (id: number, res: Response, sendNotFound = true) {
-  const promise = AccountModel.load(id)
+function doesAccountIdExist (id: number | string, res: Response, sendNotFound = true) {
+  const promise = AccountModel.load(parseInt(id + '', 10))
 
   return doesAccountExist(promise, res, sendNotFound)
 }
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'
diff --git a/server/helpers/middlewares/video-abuses.ts b/server/helpers/middlewares/video-abuses.ts
deleted file mode 100644
index 97a5724b6..000000000
--- a/server/helpers/middlewares/video-abuses.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { Response } from 'express'
-import { VideoAbuseModel } from '../../models/video/video-abuse'
-import { fetchVideo } from '../video'
-
-async function doesVideoAbuseExist (abuseIdArg: number | string, videoUUID: string, res: Response) {
-  const abuseId = parseInt(abuseIdArg + '', 10)
-  let videoAbuse = await VideoAbuseModel.loadByIdAndVideoId(abuseId, null, videoUUID)
-
-  if (!videoAbuse) {
-    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 (videoAbuse === null) {
-    res.status(404)
-       .json({ error: 'Video abuse not found' })
-       .end()
-
-    return false
-  }
-
-  res.locals.videoAbuse = videoAbuse
-  return true
-}
-
-// ---------------------------------------------------------------------------
-
-export {
-  doesVideoAbuseExist
-}