Merge branch 'release/v1.2.0'

[github/Chocobozzz/PeerTube.git] / shared / models / videos / video.model.ts

diff --git a/shared/models/videos/video.model.ts b/shared/models/videos/video.model.ts
index 676354ce374095820d8b8292e21e3cead464f7c3..022876a0bffe83c66af02018fbc8c2e84378f83c 100644 (file)
--- a/shared/models/videos/video.model.ts
+++ b/shared/models/videos/video.model.ts
@@ -1,13 +1,10 @@
 import { VideoResolution, VideoState } from '../../index'
 import { Account } from '../actors'
 import { Avatar } from '../avatars/avatar.model'
-import { VideoChannel } from './video-channel.model'
+import { VideoChannel } from './channel/video-channel.model'
 import { VideoPrivacy } from './video-privacy.enum'
-
-export interface VideoConstant <T> {
-  id: T
-  label: string
-}
+import { VideoScheduleUpdate } from './video-schedule-update.model'
+import { VideoConstant } from './video-constant.model'
 
 export interface VideoFile {
   magnetUri: string
@@ -17,6 +14,27 @@ export interface VideoFile {
   torrentDownloadUrl: string
   fileUrl: string
   fileDownloadUrl: string
+  fps: number
+}
+
+export interface VideoChannelAttribute {
+  id: number
+  uuid: string
+  name: string
+  displayName: string
+  url: string
+  host: string
+  avatar?: Avatar
+}
+
+export interface AccountAttribute {
+  id: number
+  uuid: string
+  name: string
+  displayName: string
+  url: string
+  host: string
+  avatar?: Avatar
 }
 
 export interface Video {
@@ -43,29 +61,16 @@ export interface Video {
 
   waitTranscoding?: boolean
   state?: VideoConstant<VideoState>
-  scheduledUpdate?: {
-    updateAt: Date | string
-    privacy?: VideoPrivacy
-  }
+  scheduledUpdate?: VideoScheduleUpdate
 
-  account: {
-    id: number
-    uuid: string
-    name: string
-    displayName: string
-    url: string
-    host: string
-    avatar: Avatar
-  }
+  blacklisted?: boolean
+  blacklistedReason?: string
+
+  account: AccountAttribute
+  channel: VideoChannelAttribute
 
-  channel: {
-    id: number
-    uuid: string
-    name: string
-    displayName: string
-    url: string
-    host: string
-    avatar: Avatar
+  userHistory?: {
+    currentTime: number
   }
 }