diff options
Diffstat (limited to 'server/typings/models/video/video.ts')
-rw-r--r-- | server/typings/models/video/video.ts | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/server/typings/models/video/video.ts b/server/typings/models/video/video.ts index 9a53bd337..7f69a91de 100644 --- a/server/typings/models/video/video.ts +++ b/server/typings/models/video/video.ts | |||
@@ -10,7 +10,7 @@ import { | |||
10 | } from './video-channels' | 10 | } from './video-channels' |
11 | import { MTag } from './tag' | 11 | import { MTag } from './tag' |
12 | import { MVideoCaptionLanguage } from './video-caption' | 12 | import { MVideoCaptionLanguage } from './video-caption' |
13 | import { MStreamingPlaylist, MStreamingPlaylistRedundancies, MStreamingPlaylistRedundanciesOpt } from './video-streaming-playlist' | 13 | import { MStreamingPlaylistFiles, MStreamingPlaylistRedundancies, MStreamingPlaylistRedundanciesOpt } from './video-streaming-playlist' |
14 | import { MVideoFile, MVideoFileRedundanciesOpt } from './video-file' | 14 | import { MVideoFile, MVideoFileRedundanciesOpt } from './video-file' |
15 | import { MThumbnail } from './thumbnail' | 15 | import { MThumbnail } from './thumbnail' |
16 | import { MVideoBlacklist, MVideoBlacklistLight, MVideoBlacklistUnfederated } from './video-blacklist' | 16 | import { MVideoBlacklist, MVideoBlacklistLight, MVideoBlacklistUnfederated } from './video-blacklist' |
@@ -40,7 +40,8 @@ export type MVideoFeed = Pick<MVideo, 'name' | 'uuid'> | |||
40 | 40 | ||
41 | // "With" to not confuse with the VideoFile model | 41 | // "With" to not confuse with the VideoFile model |
42 | export type MVideoWithFile = MVideo & | 42 | export type MVideoWithFile = MVideo & |
43 | Use<'VideoFiles', MVideoFile[]> | 43 | Use<'VideoFiles', MVideoFile[]> & |
44 | Use<'VideoStreamingPlaylists', MStreamingPlaylistFiles[]> | ||
44 | 45 | ||
45 | export type MVideoThumbnail = MVideo & | 46 | export type MVideoThumbnail = MVideo & |
46 | Use<'Thumbnails', MThumbnail[]> | 47 | Use<'Thumbnails', MThumbnail[]> |
@@ -66,7 +67,7 @@ export type MVideoWithCaptions = MVideo & | |||
66 | Use<'VideoCaptions', MVideoCaptionLanguage[]> | 67 | Use<'VideoCaptions', MVideoCaptionLanguage[]> |
67 | 68 | ||
68 | export type MVideoWithStreamingPlaylist = MVideo & | 69 | export type MVideoWithStreamingPlaylist = MVideo & |
69 | Use<'VideoStreamingPlaylists', MStreamingPlaylist[]> | 70 | Use<'VideoStreamingPlaylists', MStreamingPlaylistFiles[]> |
70 | 71 | ||
71 | // ############################################################################ | 72 | // ############################################################################ |
72 | 73 | ||
@@ -93,12 +94,12 @@ export type MVideoWithRights = MVideo & | |||
93 | export type MVideoWithAllFiles = MVideo & | 94 | export type MVideoWithAllFiles = MVideo & |
94 | Use<'VideoFiles', MVideoFile[]> & | 95 | Use<'VideoFiles', MVideoFile[]> & |
95 | Use<'Thumbnails', MThumbnail[]> & | 96 | Use<'Thumbnails', MThumbnail[]> & |
96 | Use<'VideoStreamingPlaylists', MStreamingPlaylist[]> | 97 | Use<'VideoStreamingPlaylists', MStreamingPlaylistFiles[]> |
97 | 98 | ||
98 | export type MVideoAccountLightBlacklistAllFiles = MVideo & | 99 | export type MVideoAccountLightBlacklistAllFiles = MVideo & |
99 | Use<'VideoFiles', MVideoFile[]> & | 100 | Use<'VideoFiles', MVideoFile[]> & |
100 | Use<'Thumbnails', MThumbnail[]> & | 101 | Use<'Thumbnails', MThumbnail[]> & |
101 | Use<'VideoStreamingPlaylists', MStreamingPlaylist[]> & | 102 | Use<'VideoStreamingPlaylists', MStreamingPlaylistFiles[]> & |
102 | Use<'VideoChannel', MChannelAccountLight> & | 103 | Use<'VideoChannel', MChannelAccountLight> & |
103 | Use<'VideoBlacklist', MVideoBlacklistLight> | 104 | Use<'VideoBlacklist', MVideoBlacklistLight> |
104 | 105 | ||
@@ -124,7 +125,7 @@ export type MVideoFullLight = MVideo & | |||
124 | Use<'UserVideoHistories', MUserVideoHistoryTime[]> & | 125 | Use<'UserVideoHistories', MUserVideoHistoryTime[]> & |
125 | Use<'VideoFiles', MVideoFile[]> & | 126 | Use<'VideoFiles', MVideoFile[]> & |
126 | Use<'ScheduleVideoUpdate', MScheduleVideoUpdate> & | 127 | Use<'ScheduleVideoUpdate', MScheduleVideoUpdate> & |
127 | Use<'VideoStreamingPlaylists', MStreamingPlaylist[]> | 128 | Use<'VideoStreamingPlaylists', MStreamingPlaylistFiles[]> |
128 | 129 | ||
129 | // ############################################################################ | 130 | // ############################################################################ |
130 | 131 | ||
@@ -133,10 +134,11 @@ export type MVideoFullLight = MVideo & | |||
133 | export type MVideoAP = MVideo & | 134 | export type MVideoAP = MVideo & |
134 | Use<'Tags', MTag[]> & | 135 | Use<'Tags', MTag[]> & |
135 | Use<'VideoChannel', MChannelAccountLight> & | 136 | Use<'VideoChannel', MChannelAccountLight> & |
136 | Use<'VideoStreamingPlaylists', MStreamingPlaylist[]> & | 137 | Use<'VideoStreamingPlaylists', MStreamingPlaylistFiles[]> & |
137 | Use<'VideoCaptions', MVideoCaptionLanguage[]> & | 138 | Use<'VideoCaptions', MVideoCaptionLanguage[]> & |
138 | Use<'VideoBlacklist', MVideoBlacklistUnfederated> & | 139 | Use<'VideoBlacklist', MVideoBlacklistUnfederated> & |
139 | Use<'VideoFiles', MVideoFileRedundanciesOpt[]> | 140 | Use<'VideoFiles', MVideoFileRedundanciesOpt[]> & |
141 | Use<'Thumbnails', MThumbnail[]> | ||
140 | 142 | ||
141 | export type MVideoAPWithoutCaption = Omit<MVideoAP, 'VideoCaptions'> | 143 | export type MVideoAPWithoutCaption = Omit<MVideoAP, 'VideoCaptions'> |
142 | 144 | ||