Merge branch 'master' into release/3.3.0

[github/Chocobozzz/PeerTube.git] / server / helpers / custom-validators / video-ownership.ts

diff --git a/server/helpers/custom-validators/video-ownership.ts b/server/helpers/custom-validators/video-ownership.ts
index 21a6b72031b773e383059efb844dc4a7da76c433..0e1c63bad7b9d8afb0d60aaa5ca839a0d17ddf45 100644 (file)
--- a/server/helpers/custom-validators/video-ownership.ts
+++ b/server/helpers/custom-validators/video-ownership.ts
@@ -1,26 +1,9 @@
 import { Response } from 'express'
-import { VideoChangeOwnershipModel } from '../../models/video/video-change-ownership'
-import { MVideoChangeOwnershipFull } from '@server/types/models/video/video-change-ownership'
 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 (idArg: number | string, res: Response) {
-  const id = parseInt(idArg + '', 10)
-  const videoChangeOwnership = await VideoChangeOwnershipModel.load(id)
-
-  if (!videoChangeOwnership) {
-    res.fail({
-      status: HttpStatusCode.NOT_FOUND_404,
-      message: 'Video change ownership not found'
-    })
-    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
   }
@@ -31,3 +14,7 @@ export function checkUserCanTerminateOwnershipChange (user: MUserId, videoChange
   })
   return false
 }
+
+export {
+  checkUserCanTerminateOwnershipChange
+}