Move middleware utils in middlewares

helpers modules should not import models

1 files changed, 1 insertions, 64 deletions

diff --git a/server/helpers/video.ts b/server/helpers/video.ts
index 7c510f474..d3445bed5 100644
--- a/server/helpers/video.ts
+++ b/server/helpers/video.ts
@@ -1,66 +1,7 @@
 import { Response } from 'express'
 import { CONFIG } from '@server/initializers/config'
-import {
-  isStreamingPlaylist,
-  MStreamingPlaylistVideo,
-  MVideo,
-  MVideoAccountLightBlacklistAllFiles,
-  MVideoFullLight,
-  MVideoIdThumbnail,
-  MVideoImmutable,
-  MVideoThumbnail,
-  MVideoWithRights
-} from '@server/types/models'
+import { isStreamingPlaylist, MStreamingPlaylistVideo, MVideo } from '@server/types/models'
 import { VideoPrivacy, VideoState } from '@shared/models'
-import { VideoModel } from '../models/video/video'
-
-type VideoFetchType = 'all' | 'only-video' | 'only-video-with-rights' | 'id' | 'none' | 'only-immutable-attributes'
-
-function fetchVideo (id: number | string, fetchType: 'all', userId?: number): Promise<MVideoFullLight>
-function fetchVideo (id: number | string, fetchType: 'only-immutable-attributes'): Promise<MVideoImmutable>
-function fetchVideo (id: number | string, fetchType: 'only-video', userId?: number): Promise<MVideoThumbnail>
-function fetchVideo (id: number | string, fetchType: 'only-video-with-rights', userId?: number): Promise<MVideoWithRights>
-function fetchVideo (id: number | string, fetchType: 'id' | 'none', userId?: number): Promise<MVideoIdThumbnail>
-function fetchVideo (
-  id: number | string,
-  fetchType: VideoFetchType,
-  userId?: number
-): Promise<MVideoFullLight | MVideoThumbnail | MVideoWithRights | MVideoIdThumbnail | MVideoImmutable>
-function fetchVideo (
-  id: number | string,
-  fetchType: VideoFetchType,
-  userId?: number
-): Promise<MVideoFullLight | MVideoThumbnail | MVideoWithRights | MVideoIdThumbnail | MVideoImmutable> {
-  if (fetchType === 'all') return VideoModel.loadAndPopulateAccountAndServerAndTags(id, undefined, userId)
-
-  if (fetchType === 'only-immutable-attributes') return VideoModel.loadImmutableAttributes(id)
-
-  if (fetchType === 'only-video-with-rights') return VideoModel.loadWithRights(id)
-
-  if (fetchType === 'only-video') return VideoModel.load(id)
-
-  if (fetchType === 'id' || fetchType === 'none') return VideoModel.loadOnlyId(id)
-}
-
-type VideoFetchByUrlType = 'all' | 'only-video' | 'only-immutable-attributes'
-
-function fetchVideoByUrl (url: string, fetchType: 'all'): Promise<MVideoAccountLightBlacklistAllFiles>
-function fetchVideoByUrl (url: string, fetchType: 'only-immutable-attributes'): Promise<MVideoImmutable>
-function fetchVideoByUrl (url: string, fetchType: 'only-video'): Promise<MVideoThumbnail>
-function fetchVideoByUrl (
-  url: string,
-  fetchType: VideoFetchByUrlType
-): Promise<MVideoAccountLightBlacklistAllFiles | MVideoThumbnail | MVideoImmutable>
-function fetchVideoByUrl (
-  url: string,
-  fetchType: VideoFetchByUrlType
-): Promise<MVideoAccountLightBlacklistAllFiles | MVideoThumbnail | MVideoImmutable> {
-  if (fetchType === 'all') return VideoModel.loadByUrlAndPopulateAccount(url)
-
-  if (fetchType === 'only-immutable-attributes') return VideoModel.loadByUrlImmutableAttributes(url)
-
-  if (fetchType === 'only-video') return VideoModel.loadByUrl(url)
-}
 
 function getVideoWithAttributes (res: Response) {
   return res.locals.videoAll || res.locals.onlyVideo || res.locals.onlyVideoWithRights
@@ -100,11 +41,7 @@ function getExtFromMimetype (mimeTypes: { [id: string]: string | string[] }, mim
 }
 
 export {
-  VideoFetchType,
-  VideoFetchByUrlType,
-  fetchVideo,
   getVideoWithAttributes,
-  fetchVideoByUrl,
   extractVideo,
   getExtFromMimetype,
   isStateForFederation,