X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=shared%2Fmodels%2Fvideos%2Fvideo.model.ts;h=b47ab1ab8c1e0a0a7ff9e3da413fe55f82701adf;hb=2d3741d6d92e9bd1f41694c7442a6d1da434e1f2;hp=13b9c49b3e1a9cbd9120d6c4ebfc0c3475a76de9;hpb=50d6de9c286abcb34ff4234d56d9cbb803db7665;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/shared/models/videos/video.model.ts b/shared/models/videos/video.model.ts
index 13b9c49b3..b47ab1ab8 100644
--- a/shared/models/videos/video.model.ts
+++ b/shared/models/videos/video.model.ts
@@ -1,33 +1,56 @@
+import { VideoResolution, VideoState } from '../../index'
 import { Account } from '../actors'
-import { VideoChannel } from './video-channel.model'
+import { Avatar } from '../avatars/avatar.model'
+import { VideoChannel } from './channel/video-channel.model'
 import { VideoPrivacy } from './video-privacy.enum'
+import { VideoScheduleUpdate } from './video-schedule-update.model'
+import { VideoConstant } from './video-constant.model'
 
 export interface VideoFile {
   magnetUri: string
-  resolution: number
-  resolutionLabel: string
+  resolution: VideoConstant<VideoResolution>
   size: number // Bytes
   torrentUrl: string
+  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 {
   id: number
   uuid: string
-  accountName: string
   createdAt: Date | string
   updatedAt: Date | string
-  categoryLabel: string
-  category: number
-  licenceLabel: string
-  licence: number
-  languageLabel: string
-  language: number
+  publishedAt: Date | string
+  category: VideoConstant<number>
+  licence: VideoConstant<number>
+  language: VideoConstant<string>
+  privacy: VideoConstant<VideoPrivacy>
   description: string
   duration: number
   isLocal: boolean
   name: string
-  serverHost: string
   thumbnailPath: string
   previewPath: string
   embedPath: string
@@ -35,14 +58,28 @@ export interface Video {
   likes: number
   dislikes: number
   nsfw: boolean
+
+  waitTranscoding?: boolean
+  state?: VideoConstant<VideoState>
+  scheduledUpdate?: VideoScheduleUpdate
+
+  blacklisted?: boolean
+  blacklistedReason?: string
+
+  account: AccountAttribute
+  channel: VideoChannelAttribute
 }
 
 export interface VideoDetails extends Video {
-  privacy: VideoPrivacy
-  privacyLabel: string
   descriptionPath: string
+  support: string
   channel: VideoChannel
   tags: string[]
   files: VideoFile[]
   account: Account
+  commentsEnabled: boolean
+
+  // Not optional in details (unlike in Video)
+  waitTranscoding: boolean
+  state: VideoConstant<VideoState>
 }