Fix pending subscription deletion

[github/Chocobozzz/PeerTube.git] / server / helpers / video.ts

diff --git a/server/helpers/video.ts b/server/helpers/video.ts
index 488b4da17149118b559664fed007fe5a0760e7b4..c688ef1e3b108aa1d7f6b90f949b558870700f33 100644 (file)
--- a/server/helpers/video.ts
+++ b/server/helpers/video.ts
@@ -1,94 +1,11 @@
-import * as Bluebird from 'bluebird'
 import { Response } from 'express'
 import { CONFIG } from '@server/initializers/config'
-import { DEFAULT_AUDIO_RESOLUTION } from '@server/initializers/constants'
-import { JobQueue } from '@server/lib/job-queue'
-import {
-  isStreamingPlaylist,
-  MStreamingPlaylistVideo,
-  MVideo,
-  MVideoAccountLightBlacklistAllFiles,
-  MVideoFile,
-  MVideoFullLight,
-  MVideoIdThumbnail,
-  MVideoImmutable,
-  MVideoThumbnail,
-  MVideoWithRights
-} from '@server/types/models'
-import { VideoPrivacy, VideoTranscodingPayload } 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): Bluebird<MVideoFullLight>
-function fetchVideo (id: number | string, fetchType: 'only-immutable-attributes'): Bluebird<MVideoImmutable>
-function fetchVideo (id: number | string, fetchType: 'only-video', userId?: number): Bluebird<MVideoThumbnail>
-function fetchVideo (id: number | string, fetchType: 'only-video-with-rights', userId?: number): Bluebird<MVideoWithRights>
-function fetchVideo (id: number | string, fetchType: 'id' | 'none', userId?: number): Bluebird<MVideoIdThumbnail>
-function fetchVideo (
-  id: number | string,
-  fetchType: VideoFetchType,
-  userId?: number
-): Bluebird<MVideoFullLight | MVideoThumbnail | MVideoWithRights | MVideoIdThumbnail | MVideoImmutable>
-function fetchVideo (
-  id: number | string,
-  fetchType: VideoFetchType,
-  userId?: number
-): Bluebird<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'): Bluebird<MVideoAccountLightBlacklistAllFiles>
-function fetchVideoByUrl (url: string, fetchType: 'only-immutable-attributes'): Bluebird<MVideoImmutable>
-function fetchVideoByUrl (url: string, fetchType: 'only-video'): Bluebird<MVideoThumbnail>
-function fetchVideoByUrl (
-  url: string,
-  fetchType: VideoFetchByUrlType
-): Bluebird<MVideoAccountLightBlacklistAllFiles | MVideoThumbnail | MVideoImmutable>
-function fetchVideoByUrl (
-  url: string,
-  fetchType: VideoFetchByUrlType
-): Bluebird<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)
-}
+import { isStreamingPlaylist, MStreamingPlaylistVideo, MVideo } from '@server/types/models'
+import { VideoPrivacy, VideoState } from '@shared/models'
+import { forceNumber } from '@shared/core-utils'
 
 function getVideoWithAttributes (res: Response) {
-  return res.locals.videoAll || res.locals.onlyVideo || res.locals.onlyVideoWithRights
-}
-
-function addOptimizeOrMergeAudioJob (video: MVideo, videoFile: MVideoFile) {
-  let dataInput: VideoTranscodingPayload
-
-  if (videoFile.isAudio()) {
-    dataInput = {
-      type: 'merge-audio' as 'merge-audio',
-      resolution: DEFAULT_AUDIO_RESOLUTION,
-      videoUUID: video.uuid,
-      isNewVideo: true
-    }
-  } else {
-    dataInput = {
-      type: 'optimize' as 'optimize',
-      videoUUID: video.uuid,
-      isNewVideo: true
-    }
-  }
-
-  return JobQueue.Instance.createJobWithPromise({ type: 'video-transcoding', payload: dataInput })
+  return res.locals.videoAPI || res.locals.videoAll || res.locals.onlyVideo
 }
 
 function extractVideo (videoOrPlaylist: MVideo | MStreamingPlaylistVideo) {
@@ -98,12 +15,18 @@ function extractVideo (videoOrPlaylist: MVideo | MStreamingPlaylistVideo) {
 }
 
 function isPrivacyForFederation (privacy: VideoPrivacy) {
-  const castedPrivacy = parseInt(privacy + '', 10)
+  const castedPrivacy = forceNumber(privacy)
 
   return castedPrivacy === VideoPrivacy.PUBLIC ||
     (CONFIG.FEDERATION.VIDEOS.FEDERATE_UNLISTED === true && castedPrivacy === VideoPrivacy.UNLISTED)
 }
 
+function isStateForFederation (state: VideoState) {
+  const castedState = forceNumber(state)
+
+  return castedState === VideoState.PUBLISHED || castedState === VideoState.WAITING_FOR_LIVE || castedState === VideoState.LIVE_ENDED
+}
+
 function getPrivaciesForFederation () {
   return (CONFIG.FEDERATION.VIDEOS.FEDERATE_UNLISTED === true)
     ? [ { privacy: VideoPrivacy.PUBLIC }, { privacy: VideoPrivacy.UNLISTED } ]
@@ -119,14 +42,10 @@ function getExtFromMimetype (mimeTypes: { [id: string]: string | string[] }, mim
 }
 
 export {
-  VideoFetchType,
-  VideoFetchByUrlType,
-  fetchVideo,
   getVideoWithAttributes,
-  fetchVideoByUrl,
-  addOptimizeOrMergeAudioJob,
   extractVideo,
   getExtFromMimetype,
+  isStateForFederation,
   isPrivacyForFederation,
   getPrivaciesForFederation
 }