X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=server%2Ftypings%2Fmodels%2Fvideo%2Fvideo-import.ts;h=4e5c2e4f0ae2635e6b0c93a821788817ed6a4c37;hb=d6d951ddc0c492f3261065b5dcb4df0534d252fc;hp=c6a1c5b66723229b5c514213c4558b078d936323;hpb=5c5e587307a27e173333789b5b5167d35f468b01;p=oweals%2Fpeertube.git diff --git a/server/typings/models/video/video-import.ts b/server/typings/models/video/video-import.ts index c6a1c5b66..4e5c2e4f0 100644 --- a/server/typings/models/video/video-import.ts +++ b/server/typings/models/video/video-import.ts @@ -1,6 +1,7 @@ import { VideoImportModel } from '@server/models/video/video-import' import { PickWith, PickWithOpt } from '@server/typings/utils' -import { MUser, MVideo, MVideoAccountLight, MVideoFormattable, MVideoTag, MVideoThumbnail, MVideoWithFile } from '@server/typings/models' +import { MVideo, MVideoAccountLight, MVideoFormattable, MVideoTag, MVideoThumbnail, MVideoWithFile } from './video' +import { MUser } from '../user/user' type Use = PickWith @@ -8,18 +9,21 @@ type Use = PickWith export type MVideoImport = Omit -export type MVideoImportVideo = MVideoImport & +export type MVideoImportVideo = + MVideoImport & Use<'Video', MVideo> // ############################################################################ type VideoAssociation = MVideoTag & MVideoAccountLight & MVideoThumbnail -export type MVideoImportDefault = MVideoImport & +export type MVideoImportDefault = + MVideoImport & Use<'User', MUser> & Use<'Video', VideoAssociation> -export type MVideoImportDefaultFiles = MVideoImport & +export type MVideoImportDefaultFiles = + MVideoImport & Use<'User', MUser> & Use<'Video', VideoAssociation & MVideoWithFile> @@ -27,5 +31,6 @@ export type MVideoImportDefaultFiles = MVideoImport & // Format for API or AP object -export type MVideoImportFormattable = MVideoImport & +export type MVideoImportFormattable = + MVideoImport & PickWithOpt