X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Fhelpers%2Fcustom-validators%2Fvideo-ownership.ts;h=0e1c63bad7b9d8afb0d60aaa5ca839a0d17ddf45;hb=10363c74c1d869f0e0c7bc4d0367b1f34d1bb6a4;hp=9570b27995bd3bcc9f3b77fd163dec02a2fd165a;hpb=001ed2d40c8d2c8f494f5dc7f91ed62d56df10fd;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/server/helpers/custom-validators/video-ownership.ts b/server/helpers/custom-validators/video-ownership.ts
index 9570b2799..0e1c63bad 100644
--- a/server/helpers/custom-validators/video-ownership.ts
+++ b/server/helpers/custom-validators/video-ownership.ts
@@ -1,30 +1,20 @@
 import { Response } from 'express'
-import { VideoChangeOwnershipModel } from '../../models/video/video-change-ownership'
-import { MVideoChangeOwnershipFull } from '@server/typings/models/video/video-change-ownership'
-import { MUserId } from '@server/typings/models'
+import { MUserId } from '@server/types/models'
+import { MVideoChangeOwnershipFull } from '@server/types/models/video/video-change-ownership'
+import { HttpStatusCode } from '../../../shared/core-utils/miscs/http-error-codes'
 
-export async function doesChangeVideoOwnershipExist (id: number, res: Response) {
-  const videoChangeOwnership = await VideoChangeOwnershipModel.load(id)
-
-  if (!videoChangeOwnership) {
-    res.status(404)
-      .json({ error: 'Video change ownership not found' })
-      .end()
-
-    return false
-  }
-
-  res.locals.videoChangeOwnership = videoChangeOwnership
-  return true
-}
-
-export function checkUserCanTerminateOwnershipChange (user: MUserId, videoChangeOwnership: MVideoChangeOwnershipFull, res: Response) {
+function checkUserCanTerminateOwnershipChange (user: MUserId, videoChangeOwnership: MVideoChangeOwnershipFull, res: Response) {
   if (videoChangeOwnership.NextOwner.userId === user.id) {
     return true
   }
 
-  res.status(403)
-    .json({ error: 'Cannot terminate an ownership change of another user' })
-    .end()
+  res.fail({
+    status: HttpStatusCode.FORBIDDEN_403,
+    message: 'Cannot terminate an ownership change of another user'
+  })
   return false
 }
+
+export {
+  checkUserCanTerminateOwnershipChange
+}