X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=server%2Ftypes%2Fmodels%2Fvideo%2Fvideo.ts;h=58ae7baad3043804c96deb625878e1153ba4e3e8;hb=64aa66c4a61e1c6aa83a775e7af498e288ea82e4;hp=16ddaf740e835193b6e20bf02ab2c4863596ad93;hpb=42ec411bf879ef9505b93f74610d787320643193;p=github%2FChocobozzz%2FPeerTube.git diff --git a/server/types/models/video/video.ts b/server/types/models/video/video.ts index 16ddaf740..58ae7baad 100644 --- a/server/types/models/video/video.ts +++ b/server/types/models/video/video.ts @@ -1,4 +1,4 @@ -import { PickWith, PickWithOpt } from '@shared/core-utils' +import { PickWith, PickWithOpt } from '@shared/typescript-utils' import { VideoModel } from '../../../models/video/video' import { MTrackerUrl } from '../server/tracker' import { MUserVideoHistoryTime } from '../user/user-video-history' @@ -13,7 +13,7 @@ import { MChannelAccountSummaryFormattable, MChannelActor, MChannelFormattable, - MChannelHost, + MChannelHostOnly, MChannelUserId } from './video-channels' import { MVideoFile, MVideoFileRedundanciesAll, MVideoFileRedundanciesOpt } from './video-file' @@ -146,7 +146,7 @@ export type MVideoWithChannelActor = export type MVideoWithHost = MVideo & - Use<'VideoChannel', MChannelHost> + Use<'VideoChannel', MChannelHostOnly> export type MVideoFullLight = MVideo & @@ -210,7 +210,9 @@ export type MVideoFormattable = PickWithOpt & Use<'VideoChannel', MChannelAccountSummaryFormattable> & PickWithOpt> & - PickWithOpt> + PickWithOpt> & + PickWithOpt & + PickWithOpt export type MVideoFormattableDetails = MVideoFormattable &