16 files changed, 16 insertions, 16 deletions
diff --git a/server/types/models/video/schedule-video-update.ts b/server/types/models/video/schedule-video-update.ts
index 6336fdabe..5d2936000 100644
--- a/server/types/models/video/schedule-video-update.ts
+++ b/server/types/models/video/schedule-video-update.ts
@@ -1,5 +1,5 @@
 import { ScheduleVideoUpdateModel } from '../../../models/video/schedule-video-update'
-import { PickWith } from '@server/types/utils'
+import { PickWith } from '@shared/core-utils'
 import { MVideoAPWithoutCaption, MVideoWithBlacklistLight } from './video'
 type Use<K extends keyof ScheduleVideoUpdateModel, M> = PickWith<ScheduleVideoUpdateModel, K, M>
diff --git a/server/types/models/video/video-abuse.ts b/server/types/models/video/video-abuse.ts
index d60f05e4c..279a87cf3 100644
--- a/server/types/models/video/video-abuse.ts
+++ b/server/types/models/video/video-abuse.ts
@@ -1,5 +1,5 @@
 import { VideoAbuseModel } from '../../../models/video/video-abuse'
-import { PickWith } from '../../utils'
+import { PickWith } from '@shared/core-utils'
 import { MVideoAccountLightBlacklistAllFiles, MVideo } from './video'
 import { MAccountDefault, MAccountFormattable } from '../account'
diff --git a/server/types/models/video/video-blacklist.ts b/server/types/models/video/video-blacklist.ts
index 08e59284a..2ac912405 100644
--- a/server/types/models/video/video-blacklist.ts
+++ b/server/types/models/video/video-blacklist.ts
@@ -1,5 +1,5 @@
 import { VideoBlacklistModel } from '../../../models/video/video-blacklist'
-import { PickWith } from '@server/types/utils'
+import { PickWith } from '@shared/core-utils'
 import { MVideo, MVideoFormattable } from './video'
 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 9bb067001..ab80ff830 100644
--- a/server/types/models/video/video-caption.ts
+++ b/server/types/models/video/video-caption.ts
@@ -1,5 +1,5 @@
 import { VideoCaptionModel } from '../../../models/video/video-caption'
-import { FunctionProperties, PickWith } from '@server/types/utils'
+import { FunctionProperties, PickWith } from '@shared/core-utils'
 import { MVideo, MVideoUUID } from './video'
 type Use<K extends keyof VideoCaptionModel, M> = PickWith<VideoCaptionModel, K, M>
diff --git a/server/types/models/video/video-change-ownership.ts b/server/types/models/video/video-change-ownership.ts
index 7421e081e..244d1a671 100644
--- a/server/types/models/video/video-change-ownership.ts
+++ b/server/types/models/video/video-change-ownership.ts
@@ -1,5 +1,5 @@
 import { VideoChangeOwnershipModel } from '@server/models/video/video-change-ownership'
-import { PickWith } from '@server/types/utils'
+import { PickWith } from '@shared/core-utils'
 import { MAccountDefault, MAccountFormattable } from '../account/account'
 import { MVideo, MVideoWithAllFiles } from './video'
diff --git a/server/types/models/video/video-channels.ts b/server/types/models/video/video-channels.ts
index 50f7c2d8a..2e05d8753 100644
--- a/server/types/models/video/video-channels.ts
+++ b/server/types/models/video/video-channels.ts
@@ -1,4 +1,4 @@
-import { FunctionProperties, PickWith, PickWithOpt } from '../../utils'
+import { FunctionProperties, PickWith, PickWithOpt } from '@shared/core-utils'
 import { VideoChannelModel } from '../../../models/video/video-channel'
 import {
  MAccountActor,
diff --git a/server/types/models/video/video-comment.ts b/server/types/models/video/video-comment.ts
index d6e0b66f5..f1c50c753 100644
--- a/server/types/models/video/video-comment.ts
+++ b/server/types/models/video/video-comment.ts
@@ -1,5 +1,5 @@
 import { VideoCommentModel } from '../../../models/video/video-comment'
-import { PickWith, PickWithOpt } from '../../utils'
+import { PickWith, PickWithOpt } from '@shared/core-utils'
 import { MAccountDefault, MAccountFormattable, MAccountUrl } from '../account'
 import { 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 3fcaca78f..327a148ce 100644
--- a/server/types/models/video/video-file.ts
+++ b/server/types/models/video/video-file.ts
@@ -1,5 +1,5 @@
 import { VideoFileModel } from '../../../models/video/video-file'
-import { PickWith, PickWithOpt } from '../../utils'
+import { PickWith, PickWithOpt } from '@shared/core-utils'
 import { MVideo, MVideoUUID } from './video'
 import { MVideoRedundancy, MVideoRedundancyFileUrl } from './video-redundancy'
 import { MStreamingPlaylistVideo, MStreamingPlaylist } from './video-streaming-playlist'
diff --git a/server/types/models/video/video-import.ts b/server/types/models/video/video-import.ts
index f1385877e..759b13c6e 100644
--- a/server/types/models/video/video-import.ts
+++ b/server/types/models/video/video-import.ts
@@ -1,5 +1,5 @@
 import { VideoImportModel } from '@server/models/video/video-import'
-import { PickWith, PickWithOpt } from '@server/types/utils'
+import { PickWith, PickWithOpt } from '@shared/core-utils'
 import { MVideo, MVideoAccountLight, MVideoFormattable, MVideoTag, MVideoThumbnail, MVideoWithFile } from './video'
 import { MUser } from '../user/user'
diff --git a/server/types/models/video/video-playlist-element.ts b/server/types/models/video/video-playlist-element.ts
index c50992da7..f46ff4d49 100644
--- a/server/types/models/video/video-playlist-element.ts
+++ b/server/types/models/video/video-playlist-element.ts
@@ -1,5 +1,5 @@
 import { VideoPlaylistElementModel } from '@server/models/video/video-playlist-element'
-import { PickWith } from '@server/types/utils'
+import { PickWith } from '@shared/core-utils'
 import { MVideoFormattable, MVideoThumbnail, MVideoUrl } from './video'
 import { MVideoPlaylistPrivacy } from './video-playlist'
diff --git a/server/types/models/video/video-playlist.ts b/server/types/models/video/video-playlist.ts
index b504d1664..79e2daebf 100644
--- a/server/types/models/video/video-playlist.ts
+++ b/server/types/models/video/video-playlist.ts
@@ -1,5 +1,5 @@
 import { VideoPlaylistModel } from '../../../models/video/video-playlist'
-import { PickWith } from '../../utils'
+import { PickWith } from '@shared/core-utils'
 import { MAccount, MAccountDefault, MAccountSummary, MAccountSummaryFormattable } from '../account'
 import { MThumbnail } from './thumbnail'
 import { MChannelDefault, MChannelSummary, MChannelSummaryFormattable, MChannelUrl } from './video-channels'
diff --git a/server/types/models/video/video-rate.ts b/server/types/models/video/video-rate.ts
index a7682ef31..7bd54f7b0 100644
--- a/server/types/models/video/video-rate.ts
+++ b/server/types/models/video/video-rate.ts
@@ -1,5 +1,5 @@
 import { AccountVideoRateModel } from '@server/models/account/account-video-rate'
-import { PickWith } from '@server/types/utils'
+import { PickWith } from '@shared/core-utils'
 import { MAccountAudience, MAccountUrl } from '../account/account'
 import { MVideo, MVideoFormattable } from './video'
diff --git a/server/types/models/video/video-redundancy.ts b/server/types/models/video/video-redundancy.ts
index 7c7d52035..411375c81 100644
--- a/server/types/models/video/video-redundancy.ts
+++ b/server/types/models/video/video-redundancy.ts
@@ -1,5 +1,5 @@
 import { VideoRedundancyModel } from '../../../models/redundancy/video-redundancy'
-import { PickWith, PickWithOpt } from '@server/types/utils'
+import { PickWith, PickWithOpt } from '@shared/core-utils'
 import { VideoStreamingPlaylistModel } from '@server/models/video/video-streaming-playlist'
 import { VideoFileModel } from '@server/models/video/video-file'
 import { MVideoFile, MVideoFileVideo } from './video-file'
diff --git a/server/types/models/video/video-share.ts b/server/types/models/video/video-share.ts
index 50ca75d26..b7a783bb6 100644
--- a/server/types/models/video/video-share.ts
+++ b/server/types/models/video/video-share.ts
@@ -1,5 +1,5 @@
 import { VideoShareModel } from '../../../models/video/video-share'
-import { PickWith } from '../../utils'
+import { PickWith } from '@shared/core-utils'
 import { MActorDefault } from '../account'
 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 3f54aa560..8b3ef51fc 100644
--- a/server/types/models/video/video-streaming-playlist.ts
+++ b/server/types/models/video/video-streaming-playlist.ts
@@ -1,5 +1,5 @@
 import { VideoStreamingPlaylistModel } from '../../../models/video/video-streaming-playlist'
-import { PickWith, PickWithOpt } from '../../utils'
+import { PickWith, PickWithOpt } from '@shared/core-utils'
 import { MVideoRedundancyFileUrl, MVideoRedundancy } from './video-redundancy'
 import { MVideo } from './video'
 import { MVideoFile } from './video-file'
diff --git a/server/types/models/video/video.ts b/server/types/models/video/video.ts
index 022a9566d..3d8f85b3d 100644
--- a/server/types/models/video/video.ts
+++ b/server/types/models/video/video.ts
@@ -1,5 +1,5 @@
 import { VideoModel } from '../../../models/video/video'
-import { PickWith, PickWithOpt } from '../../utils'
+import { PickWith, PickWithOpt } from '@shared/core-utils'
 import {
  MChannelAccountDefault,
  MChannelAccountLight,

diff --git a/server/types/models/video/schedule-video-update.ts b/server/types/models/video/schedule-video-update.ts index 6336fdabe..5d2936000 100644 --- a/server/types/models/video/schedule-video-update.ts +++ b/server/types/models/video/schedule-video-update.ts
@@ -1,5 +1,5 @@
1	import { ScheduleVideoUpdateModel } from '../../../models/video/schedule-video-update'	1	import { ScheduleVideoUpdateModel } from '../../../models/video/schedule-video-update'
2	import { PickWith } from '@server/types/utils'	2	import { PickWith } from '@shared/core-utils'
3	import { MVideoAPWithoutCaption, MVideoWithBlacklistLight } from './video'	3	import { MVideoAPWithoutCaption, MVideoWithBlacklistLight } from './video'
4		4
5	type Use<K extends keyof ScheduleVideoUpdateModel, M> = PickWith<ScheduleVideoUpdateModel, K, M>	5	type Use<K extends keyof ScheduleVideoUpdateModel, M> = PickWith<ScheduleVideoUpdateModel, K, M>


diff --git a/server/types/models/video/video-abuse.ts b/server/types/models/video/video-abuse.ts index d60f05e4c..279a87cf3 100644 --- a/server/types/models/video/video-abuse.ts +++ b/server/types/models/video/video-abuse.ts
@@ -1,5 +1,5 @@
1	import { VideoAbuseModel } from '../../../models/video/video-abuse'	1	import { VideoAbuseModel } from '../../../models/video/video-abuse'
2	import { PickWith } from '../../utils'	2	import { PickWith } from '@shared/core-utils'
3	import { MVideoAccountLightBlacklistAllFiles, MVideo } from './video'	3	import { MVideoAccountLightBlacklistAllFiles, MVideo } from './video'
4	import { MAccountDefault, MAccountFormattable } from '../account'	4	import { MAccountDefault, MAccountFormattable } from '../account'
5		5


diff --git a/server/types/models/video/video-blacklist.ts b/server/types/models/video/video-blacklist.ts index 08e59284a..2ac912405 100644 --- a/server/types/models/video/video-blacklist.ts +++ b/server/types/models/video/video-blacklist.ts
@@ -1,5 +1,5 @@
1	import { VideoBlacklistModel } from '../../../models/video/video-blacklist'	1	import { VideoBlacklistModel } from '../../../models/video/video-blacklist'
2	import { PickWith } from '@server/types/utils'	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 9bb067001..ab80ff830 100644 --- a/server/types/models/video/video-caption.ts +++ b/server/types/models/video/video-caption.ts
@@ -1,5 +1,5 @@
1	import { VideoCaptionModel } from '../../../models/video/video-caption'	1	import { VideoCaptionModel } from '../../../models/video/video-caption'
2	import { FunctionProperties, PickWith } from '@server/types/utils'	2	import { FunctionProperties, PickWith } from '@shared/core-utils'
3	import { MVideo, MVideoUUID } from './video'	3	import { MVideo, MVideoUUID } from './video'
4		4
5	type Use<K extends keyof VideoCaptionModel, M> = PickWith<VideoCaptionModel, K, M>	5	type Use<K extends keyof VideoCaptionModel, M> = PickWith<VideoCaptionModel, K, M>


diff --git a/server/types/models/video/video-change-ownership.ts b/server/types/models/video/video-change-ownership.ts index 7421e081e..244d1a671 100644 --- a/server/types/models/video/video-change-ownership.ts +++ b/server/types/models/video/video-change-ownership.ts
@@ -1,5 +1,5 @@
1	import { VideoChangeOwnershipModel } from '@server/models/video/video-change-ownership'	1	import { VideoChangeOwnershipModel } from '@server/models/video/video-change-ownership'
2	import { PickWith } from '@server/types/utils'	2	import { PickWith } from '@shared/core-utils'
3	import { MAccountDefault, MAccountFormattable } from '../account/account'	3	import { MAccountDefault, MAccountFormattable } from '../account/account'
4	import { MVideo, MVideoWithAllFiles } from './video'	4	import { MVideo, MVideoWithAllFiles } from './video'
5		5


diff --git a/server/types/models/video/video-channels.ts b/server/types/models/video/video-channels.ts index 50f7c2d8a..2e05d8753 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 '../../utils'	1	import { FunctionProperties, PickWith, PickWithOpt } from '@shared/core-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 d6e0b66f5..f1c50c753 100644 --- a/server/types/models/video/video-comment.ts +++ b/server/types/models/video/video-comment.ts
@@ -1,5 +1,5 @@
1	import { VideoCommentModel } from '../../../models/video/video-comment'	1	import { VideoCommentModel } from '../../../models/video/video-comment'
2	import { PickWith, PickWithOpt } from '../../utils'	2	import { PickWith, PickWithOpt } from '@shared/core-utils'
3	import { MAccountDefault, MAccountFormattable, MAccountUrl } from '../account'	3	import { MAccountDefault, MAccountFormattable, MAccountUrl } from '../account'
4	import { MVideoAccountLight, MVideoFeed, MVideoIdUrl, MVideoUrl } from './video'	4	import { MVideoAccountLight, MVideoFeed, MVideoIdUrl, MVideoUrl } from './video'
5		5


diff --git a/server/types/models/video/video-file.ts b/server/types/models/video/video-file.ts index 3fcaca78f..327a148ce 100644 --- a/server/types/models/video/video-file.ts +++ b/server/types/models/video/video-file.ts
@@ -1,5 +1,5 @@
1	import { VideoFileModel } from '../../../models/video/video-file'	1	import { VideoFileModel } from '../../../models/video/video-file'
2	import { PickWith, PickWithOpt } from '../../utils'	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 { MStreamingPlaylistVideo, MStreamingPlaylist } from './video-streaming-playlist'


diff --git a/server/types/models/video/video-import.ts b/server/types/models/video/video-import.ts index f1385877e..759b13c6e 100644 --- a/server/types/models/video/video-import.ts +++ b/server/types/models/video/video-import.ts
@@ -1,5 +1,5 @@
1	import { VideoImportModel } from '@server/models/video/video-import'	1	import { VideoImportModel } from '@server/models/video/video-import'
2	import { PickWith, PickWithOpt } from '@server/types/utils'	2	import { PickWith, PickWithOpt } from '@shared/core-utils'
3	import { MVideo, MVideoAccountLight, MVideoFormattable, MVideoTag, MVideoThumbnail, MVideoWithFile } from './video'	3	import { MVideo, MVideoAccountLight, MVideoFormattable, MVideoTag, MVideoThumbnail, MVideoWithFile } from './video'
4	import { MUser } from '../user/user'	4	import { MUser } from '../user/user'
5		5


diff --git a/server/types/models/video/video-playlist-element.ts b/server/types/models/video/video-playlist-element.ts index c50992da7..f46ff4d49 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 '@server/types/utils'	2	import { PickWith } from '@shared/core-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 b504d1664..79e2daebf 100644 --- a/server/types/models/video/video-playlist.ts +++ b/server/types/models/video/video-playlist.ts
@@ -1,5 +1,5 @@
1	import { VideoPlaylistModel } from '../../../models/video/video-playlist'	1	import { VideoPlaylistModel } from '../../../models/video/video-playlist'
2	import { PickWith } from '../../utils'	2	import { PickWith } from '@shared/core-utils'
3	import { MAccount, MAccountDefault, MAccountSummary, MAccountSummaryFormattable } from '../account'	3	import { MAccount, MAccountDefault, MAccountSummary, MAccountSummaryFormattable } from '../account'
4	import { MThumbnail } from './thumbnail'	4	import { MThumbnail } from './thumbnail'
5	import { MChannelDefault, MChannelSummary, MChannelSummaryFormattable, MChannelUrl } from './video-channels'	5	import { MChannelDefault, MChannelSummary, MChannelSummaryFormattable, MChannelUrl } from './video-channels'


diff --git a/server/types/models/video/video-rate.ts b/server/types/models/video/video-rate.ts index a7682ef31..7bd54f7b0 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 '@server/types/utils'	2	import { PickWith } from '@shared/core-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 7c7d52035..411375c81 100644 --- a/server/types/models/video/video-redundancy.ts +++ b/server/types/models/video/video-redundancy.ts
@@ -1,5 +1,5 @@
1	import { VideoRedundancyModel } from '../../../models/redundancy/video-redundancy'	1	import { VideoRedundancyModel } from '../../../models/redundancy/video-redundancy'
2	import { PickWith, PickWithOpt } from '@server/types/utils'	2	import { PickWith, PickWithOpt } from '@shared/core-utils'
3	import { VideoStreamingPlaylistModel } from '@server/models/video/video-streaming-playlist'	3	import { VideoStreamingPlaylistModel } from '@server/models/video/video-streaming-playlist'
4	import { VideoFileModel } from '@server/models/video/video-file'	4	import { VideoFileModel } from '@server/models/video/video-file'
5	import { MVideoFile, MVideoFileVideo } from './video-file'	5	import { MVideoFile, MVideoFileVideo } from './video-file'


diff --git a/server/types/models/video/video-share.ts b/server/types/models/video/video-share.ts index 50ca75d26..b7a783bb6 100644 --- a/server/types/models/video/video-share.ts +++ b/server/types/models/video/video-share.ts
@@ -1,5 +1,5 @@
1	import { VideoShareModel } from '../../../models/video/video-share'	1	import { VideoShareModel } from '../../../models/video/video-share'
2	import { PickWith } from '../../utils'	2	import { PickWith } from '@shared/core-utils'
3	import { MActorDefault } from '../account'	3	import { MActorDefault } from '../account'
4	import { MVideo } from './video'	4	import { MVideo } from './video'
5		5


diff --git a/server/types/models/video/video-streaming-playlist.ts b/server/types/models/video/video-streaming-playlist.ts index 3f54aa560..8b3ef51fc 100644 --- a/server/types/models/video/video-streaming-playlist.ts +++ b/server/types/models/video/video-streaming-playlist.ts
@@ -1,5 +1,5 @@
1	import { VideoStreamingPlaylistModel } from '../../../models/video/video-streaming-playlist'	1	import { VideoStreamingPlaylistModel } from '../../../models/video/video-streaming-playlist'
2	import { PickWith, PickWithOpt } from '../../utils'	2	import { PickWith, PickWithOpt } from '@shared/core-utils'
3	import { MVideoRedundancyFileUrl, MVideoRedundancy } from './video-redundancy'	3	import { MVideoRedundancyFileUrl, MVideoRedundancy } from './video-redundancy'
4	import { MVideo } from './video'	4	import { MVideo } from './video'
5	import { MVideoFile } from './video-file'	5	import { MVideoFile } from './video-file'


diff --git a/server/types/models/video/video.ts b/server/types/models/video/video.ts index 022a9566d..3d8f85b3d 100644 --- a/server/types/models/video/video.ts +++ b/server/types/models/video/video.ts
@@ -1,5 +1,5 @@
1	import { VideoModel } from '../../../models/video/video'	1	import { VideoModel } from '../../../models/video/video'
2	import { PickWith, PickWithOpt } from '../../utils'	2	import { PickWith, PickWithOpt } from '@shared/core-utils'
3	import {	3	import {
4	MChannelAccountDefault,	4	MChannelAccountDefault,
5	MChannelAccountLight,	5	MChannelAccountLight,