diff options
Diffstat (limited to 'server/types/models/video')
-rw-r--r-- | server/types/models/video/thumbnail.ts | 2 | ||||
-rw-r--r-- | server/types/models/video/video-blacklist.ts | 2 | ||||
-rw-r--r-- | server/types/models/video/video-caption.ts | 2 | ||||
-rw-r--r-- | server/types/models/video/video-change-ownership.ts | 4 | ||||
-rw-r--r-- | server/types/models/video/video-channels.ts | 2 | ||||
-rw-r--r-- | server/types/models/video/video-comment.ts | 2 | ||||
-rw-r--r-- | server/types/models/video/video-file.ts | 4 | ||||
-rw-r--r-- | server/types/models/video/video-import.ts | 4 | ||||
-rw-r--r-- | server/types/models/video/video-live.ts | 2 | ||||
-rw-r--r-- | server/types/models/video/video-playlist-element.ts | 2 | ||||
-rw-r--r-- | server/types/models/video/video-playlist.ts | 4 | ||||
-rw-r--r-- | server/types/models/video/video-rate.ts | 2 | ||||
-rw-r--r-- | server/types/models/video/video-redundancy.ts | 8 | ||||
-rw-r--r-- | server/types/models/video/video-share.ts | 2 | ||||
-rw-r--r-- | server/types/models/video/video-streaming-playlist.ts | 4 | ||||
-rw-r--r-- | server/types/models/video/video.ts | 2 |
16 files changed, 24 insertions, 24 deletions
diff --git a/server/types/models/video/thumbnail.ts b/server/types/models/video/thumbnail.ts index 81a29e062..c3b27681f 100644 --- a/server/types/models/video/thumbnail.ts +++ b/server/types/models/video/thumbnail.ts | |||
@@ -1,4 +1,4 @@ | |||
1 | import { PickWith } from '@shared/core-utils' | 1 | import { PickWith } from '@shared/typescript-utils' |
2 | import { ThumbnailModel } from '../../../models/video/thumbnail' | 2 | import { ThumbnailModel } from '../../../models/video/thumbnail' |
3 | import { MVideo } from './video' | 3 | import { MVideo } from './video' |
4 | 4 | ||
diff --git a/server/types/models/video/video-blacklist.ts b/server/types/models/video/video-blacklist.ts index 2ac912405..048b63bd2 100644 --- a/server/types/models/video/video-blacklist.ts +++ b/server/types/models/video/video-blacklist.ts | |||
@@ -1,5 +1,5 @@ | |||
1 | import { PickWith } from '@shared/typescript-utils' | ||
1 | import { VideoBlacklistModel } from '../../../models/video/video-blacklist' | 2 | import { VideoBlacklistModel } from '../../../models/video/video-blacklist' |
2 | import { PickWith } from '@shared/core-utils' | ||
3 | import { MVideo, MVideoFormattable } from './video' | 3 | import { MVideo, MVideoFormattable } from './video' |
4 | 4 | ||
5 | type Use<K extends keyof VideoBlacklistModel, M> = PickWith<VideoBlacklistModel, K, M> | 5 | type Use<K extends keyof VideoBlacklistModel, M> = PickWith<VideoBlacklistModel, K, M> |
diff --git a/server/types/models/video/video-caption.ts b/server/types/models/video/video-caption.ts index 1f761a866..8cd801064 100644 --- a/server/types/models/video/video-caption.ts +++ b/server/types/models/video/video-caption.ts | |||
@@ -1,4 +1,4 @@ | |||
1 | import { PickWith } from '@shared/core-utils' | 1 | import { PickWith } from '@shared/typescript-utils' |
2 | import { VideoCaptionModel } from '../../../models/video/video-caption' | 2 | import { VideoCaptionModel } from '../../../models/video/video-caption' |
3 | import { MVideo, MVideoUUID } from './video' | 3 | import { MVideo, MVideoUUID } from './video' |
4 | 4 | ||
diff --git a/server/types/models/video/video-change-ownership.ts b/server/types/models/video/video-change-ownership.ts index 6cad48e4a..d99f25071 100644 --- a/server/types/models/video/video-change-ownership.ts +++ b/server/types/models/video/video-change-ownership.ts | |||
@@ -1,7 +1,7 @@ | |||
1 | import { VideoChangeOwnershipModel } from '@server/models/video/video-change-ownership' | 1 | import { VideoChangeOwnershipModel } from '@server/models/video/video-change-ownership' |
2 | import { PickWith } from '@shared/core-utils' | 2 | import { PickWith } from '@shared/typescript-utils' |
3 | import { MAccountDefault, MAccountFormattable } from '../account/account' | 3 | import { MAccountDefault, MAccountFormattable } from '../account/account' |
4 | import { MVideoWithAllFiles, MVideoFormattable } from './video' | 4 | import { MVideoFormattable, MVideoWithAllFiles } from './video' |
5 | 5 | ||
6 | type Use<K extends keyof VideoChangeOwnershipModel, M> = PickWith<VideoChangeOwnershipModel, K, M> | 6 | type Use<K extends keyof VideoChangeOwnershipModel, M> = PickWith<VideoChangeOwnershipModel, K, M> |
7 | 7 | ||
diff --git a/server/types/models/video/video-channels.ts b/server/types/models/video/video-channels.ts index c147567d9..af8c2ffe4 100644 --- a/server/types/models/video/video-channels.ts +++ b/server/types/models/video/video-channels.ts | |||
@@ -1,4 +1,4 @@ | |||
1 | import { FunctionProperties, PickWith, PickWithOpt } from '@shared/core-utils' | 1 | import { FunctionProperties, PickWith, PickWithOpt } from '@shared/typescript-utils' |
2 | import { VideoChannelModel } from '../../../models/video/video-channel' | 2 | import { VideoChannelModel } from '../../../models/video/video-channel' |
3 | import { | 3 | import { |
4 | MAccountActor, | 4 | MAccountActor, |
diff --git a/server/types/models/video/video-comment.ts b/server/types/models/video/video-comment.ts index 83479e7b2..b66de064f 100644 --- a/server/types/models/video/video-comment.ts +++ b/server/types/models/video/video-comment.ts | |||
@@ -1,4 +1,4 @@ | |||
1 | import { PickWith, PickWithOpt } from '@shared/core-utils' | 1 | import { PickWith, PickWithOpt } from '@shared/typescript-utils' |
2 | import { VideoCommentModel } from '../../../models/video/video-comment' | 2 | import { VideoCommentModel } from '../../../models/video/video-comment' |
3 | import { MAccountDefault, MAccountFormattable, MAccountUrl } from '../account' | 3 | import { MAccountDefault, MAccountFormattable, MAccountUrl } from '../account' |
4 | import { MVideo, MVideoAccountLight, MVideoFeed, MVideoIdUrl, MVideoUrl } from './video' | 4 | import { MVideo, MVideoAccountLight, MVideoFeed, MVideoIdUrl, MVideoUrl } from './video' |
diff --git a/server/types/models/video/video-file.ts b/server/types/models/video/video-file.ts index 327a148ce..55603e59c 100644 --- a/server/types/models/video/video-file.ts +++ b/server/types/models/video/video-file.ts | |||
@@ -1,8 +1,8 @@ | |||
1 | import { PickWith, PickWithOpt } from '@shared/typescript-utils' | ||
1 | import { VideoFileModel } from '../../../models/video/video-file' | 2 | import { VideoFileModel } from '../../../models/video/video-file' |
2 | import { PickWith, PickWithOpt } from '@shared/core-utils' | ||
3 | import { MVideo, MVideoUUID } from './video' | 3 | import { MVideo, MVideoUUID } from './video' |
4 | import { MVideoRedundancy, MVideoRedundancyFileUrl } from './video-redundancy' | 4 | import { MVideoRedundancy, MVideoRedundancyFileUrl } from './video-redundancy' |
5 | import { MStreamingPlaylistVideo, MStreamingPlaylist } from './video-streaming-playlist' | 5 | import { MStreamingPlaylist, MStreamingPlaylistVideo } from './video-streaming-playlist' |
6 | 6 | ||
7 | type Use<K extends keyof VideoFileModel, M> = PickWith<VideoFileModel, K, M> | 7 | type Use<K extends keyof VideoFileModel, M> = PickWith<VideoFileModel, K, M> |
8 | 8 | ||
diff --git a/server/types/models/video/video-import.ts b/server/types/models/video/video-import.ts index 759b13c6e..650c293f7 100644 --- a/server/types/models/video/video-import.ts +++ b/server/types/models/video/video-import.ts | |||
@@ -1,7 +1,7 @@ | |||
1 | import { VideoImportModel } from '@server/models/video/video-import' | 1 | import { VideoImportModel } from '@server/models/video/video-import' |
2 | import { PickWith, PickWithOpt } from '@shared/core-utils' | 2 | import { PickWith, PickWithOpt } from '@shared/typescript-utils' |
3 | import { MVideo, MVideoAccountLight, MVideoFormattable, MVideoTag, MVideoThumbnail, MVideoWithFile } from './video' | ||
4 | import { MUser } from '../user/user' | 3 | import { MUser } from '../user/user' |
4 | import { MVideo, MVideoAccountLight, MVideoFormattable, MVideoTag, MVideoThumbnail, MVideoWithFile } from './video' | ||
5 | 5 | ||
6 | type Use<K extends keyof VideoImportModel, M> = PickWith<VideoImportModel, K, M> | 6 | type Use<K extends keyof VideoImportModel, M> = PickWith<VideoImportModel, K, M> |
7 | 7 | ||
diff --git a/server/types/models/video/video-live.ts b/server/types/models/video/video-live.ts index 346052417..903cea982 100644 --- a/server/types/models/video/video-live.ts +++ b/server/types/models/video/video-live.ts | |||
@@ -1,5 +1,5 @@ | |||
1 | import { VideoLiveModel } from '@server/models/video/video-live' | 1 | import { VideoLiveModel } from '@server/models/video/video-live' |
2 | import { PickWith } from '@shared/core-utils' | 2 | import { PickWith } from '@shared/typescript-utils' |
3 | import { MVideo } from './video' | 3 | import { MVideo } from './video' |
4 | 4 | ||
5 | type Use<K extends keyof VideoLiveModel, M> = PickWith<VideoLiveModel, K, M> | 5 | type Use<K extends keyof VideoLiveModel, M> = PickWith<VideoLiveModel, K, M> |
diff --git a/server/types/models/video/video-playlist-element.ts b/server/types/models/video/video-playlist-element.ts index f46ff4d49..eae676096 100644 --- a/server/types/models/video/video-playlist-element.ts +++ b/server/types/models/video/video-playlist-element.ts | |||
@@ -1,5 +1,5 @@ | |||
1 | import { VideoPlaylistElementModel } from '@server/models/video/video-playlist-element' | 1 | import { VideoPlaylistElementModel } from '@server/models/video/video-playlist-element' |
2 | import { PickWith } from '@shared/core-utils' | 2 | import { PickWith } from '@shared/typescript-utils' |
3 | import { MVideoFormattable, MVideoThumbnail, MVideoUrl } from './video' | 3 | import { MVideoFormattable, MVideoThumbnail, MVideoUrl } from './video' |
4 | import { MVideoPlaylistPrivacy } from './video-playlist' | 4 | import { MVideoPlaylistPrivacy } from './video-playlist' |
5 | 5 | ||
diff --git a/server/types/models/video/video-playlist.ts b/server/types/models/video/video-playlist.ts index 2f9537cf5..33fe5416a 100644 --- a/server/types/models/video/video-playlist.ts +++ b/server/types/models/video/video-playlist.ts | |||
@@ -1,9 +1,9 @@ | |||
1 | import { MVideoPlaylistElementLight } from '@server/types/models/video/video-playlist-element' | ||
2 | import { PickWith } from '@shared/typescript-utils' | ||
1 | import { VideoPlaylistModel } from '../../../models/video/video-playlist' | 3 | import { VideoPlaylistModel } from '../../../models/video/video-playlist' |
2 | import { PickWith } from '@shared/core-utils' | ||
3 | import { MAccount, MAccountDefault, MAccountSummary, MAccountSummaryFormattable } from '../account' | 4 | import { MAccount, MAccountDefault, MAccountSummary, MAccountSummaryFormattable } from '../account' |
4 | import { MThumbnail } from './thumbnail' | 5 | import { MThumbnail } from './thumbnail' |
5 | import { MChannelDefault, MChannelSummary, MChannelSummaryFormattable, MChannelUrl } from './video-channels' | 6 | import { MChannelDefault, MChannelSummary, MChannelSummaryFormattable, MChannelUrl } from './video-channels' |
6 | import { MVideoPlaylistElementLight } from '@server/types/models/video/video-playlist-element' | ||
7 | 7 | ||
8 | type Use<K extends keyof VideoPlaylistModel, M> = PickWith<VideoPlaylistModel, K, M> | 8 | type Use<K extends keyof VideoPlaylistModel, M> = PickWith<VideoPlaylistModel, K, M> |
9 | 9 | ||
diff --git a/server/types/models/video/video-rate.ts b/server/types/models/video/video-rate.ts index 7bd54f7b0..0dbdf3c41 100644 --- a/server/types/models/video/video-rate.ts +++ b/server/types/models/video/video-rate.ts | |||
@@ -1,5 +1,5 @@ | |||
1 | import { AccountVideoRateModel } from '@server/models/account/account-video-rate' | 1 | import { AccountVideoRateModel } from '@server/models/account/account-video-rate' |
2 | import { PickWith } from '@shared/core-utils' | 2 | import { PickWith } from '@shared/typescript-utils' |
3 | import { MAccountAudience, MAccountUrl } from '../account/account' | 3 | import { MAccountAudience, MAccountUrl } from '../account/account' |
4 | import { MVideo, MVideoFormattable } from './video' | 4 | import { MVideo, MVideoFormattable } from './video' |
5 | 5 | ||
diff --git a/server/types/models/video/video-redundancy.ts b/server/types/models/video/video-redundancy.ts index 411375c81..e2a9beb93 100644 --- a/server/types/models/video/video-redundancy.ts +++ b/server/types/models/video/video-redundancy.ts | |||
@@ -1,10 +1,10 @@ | |||
1 | import { VideoRedundancyModel } from '../../../models/redundancy/video-redundancy' | ||
2 | import { PickWith, PickWithOpt } from '@shared/core-utils' | ||
3 | import { VideoStreamingPlaylistModel } from '@server/models/video/video-streaming-playlist' | ||
4 | import { VideoFileModel } from '@server/models/video/video-file' | 1 | import { VideoFileModel } from '@server/models/video/video-file' |
2 | import { VideoStreamingPlaylistModel } from '@server/models/video/video-streaming-playlist' | ||
3 | import { PickWith, PickWithOpt } from '@shared/typescript-utils' | ||
4 | import { VideoRedundancyModel } from '../../../models/redundancy/video-redundancy' | ||
5 | import { MVideoUrl } from './video' | ||
5 | import { MVideoFile, MVideoFileVideo } from './video-file' | 6 | import { MVideoFile, MVideoFileVideo } from './video-file' |
6 | import { MStreamingPlaylistVideo } from './video-streaming-playlist' | 7 | import { MStreamingPlaylistVideo } from './video-streaming-playlist' |
7 | import { MVideoUrl } from './video' | ||
8 | 8 | ||
9 | type Use<K extends keyof VideoRedundancyModel, M> = PickWith<VideoRedundancyModel, K, M> | 9 | type Use<K extends keyof VideoRedundancyModel, M> = PickWith<VideoRedundancyModel, K, M> |
10 | 10 | ||
diff --git a/server/types/models/video/video-share.ts b/server/types/models/video/video-share.ts index 78f44e58c..ffc0edad6 100644 --- a/server/types/models/video/video-share.ts +++ b/server/types/models/video/video-share.ts | |||
@@ -1,4 +1,4 @@ | |||
1 | import { PickWith } from '@shared/core-utils' | 1 | import { PickWith } from '@shared/typescript-utils' |
2 | import { VideoShareModel } from '../../../models/video/video-share' | 2 | import { VideoShareModel } from '../../../models/video/video-share' |
3 | import { MActorDefault } from '../actor' | 3 | import { MActorDefault } from '../actor' |
4 | import { MVideo } from './video' | 4 | import { MVideo } from './video' |
diff --git a/server/types/models/video/video-streaming-playlist.ts b/server/types/models/video/video-streaming-playlist.ts index 1e4dccb8e..1c2f83489 100644 --- a/server/types/models/video/video-streaming-playlist.ts +++ b/server/types/models/video/video-streaming-playlist.ts | |||
@@ -1,8 +1,8 @@ | |||
1 | import { PickWith, PickWithOpt } from '@shared/typescript-utils' | ||
1 | import { VideoStreamingPlaylistModel } from '../../../models/video/video-streaming-playlist' | 2 | import { VideoStreamingPlaylistModel } from '../../../models/video/video-streaming-playlist' |
2 | import { PickWith, PickWithOpt } from '@shared/core-utils' | ||
3 | import { MVideoRedundancyFileUrl, MVideoRedundancy } from './video-redundancy' | ||
4 | import { MVideo } from './video' | 3 | import { MVideo } from './video' |
5 | import { MVideoFile } from './video-file' | 4 | import { MVideoFile } from './video-file' |
5 | import { MVideoRedundancy, MVideoRedundancyFileUrl } from './video-redundancy' | ||
6 | 6 | ||
7 | type Use<K extends keyof VideoStreamingPlaylistModel, M> = PickWith<VideoStreamingPlaylistModel, K, M> | 7 | type Use<K extends keyof VideoStreamingPlaylistModel, M> = PickWith<VideoStreamingPlaylistModel, K, M> |
8 | 8 | ||
diff --git a/server/types/models/video/video.ts b/server/types/models/video/video.ts index 9a6b27888..d1af53b92 100644 --- a/server/types/models/video/video.ts +++ b/server/types/models/video/video.ts | |||
@@ -1,4 +1,4 @@ | |||
1 | import { PickWith, PickWithOpt } from '@shared/core-utils' | 1 | import { PickWith, PickWithOpt } from '@shared/typescript-utils' |
2 | import { VideoModel } from '../../../models/video/video' | 2 | import { VideoModel } from '../../../models/video/video' |
3 | import { MTrackerUrl } from '../server/tracker' | 3 | import { MTrackerUrl } from '../server/tracker' |
4 | import { MUserVideoHistoryTime } from '../user/user-video-history' | 4 | import { MUserVideoHistoryTime } from '../user/user-video-history' |