Merge branch 'release/4.1.0' into develop

[github/Chocobozzz/PeerTube.git] / server / types / models / video / video-playlist.ts

diff --git a/server/types/models/video/video-playlist.ts b/server/types/models/video/video-playlist.ts
index 79e2daebf5ea9ea034da73421eba3f3f703e7a33..33fe5416adeda282fe2849deb5c5e8d5f6bedae4 100644 (file)
--- a/server/types/models/video/video-playlist.ts
+++ b/server/types/models/video/video-playlist.ts
@@ -1,9 +1,9 @@
+import { MVideoPlaylistElementLight } from '@server/types/models/video/video-playlist-element'
+import { PickWith } from '@shared/typescript-utils'
 import { VideoPlaylistModel } from '../../../models/video/video-playlist'
-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'
-import { MVideoPlaylistElementLight } from '@server/types/models/video/video-playlist-element'
 
 type Use<K extends keyof VideoPlaylistModel, M> = PickWith<VideoPlaylistModel, K, M>
 
@@ -69,7 +69,7 @@ export type MVideoPlaylistAccountChannelDefault =
 // With all associations
 
 export type MVideoPlaylistFull =
-  MVideoPlaylist &
+  MVideoPlaylistVideosLength &
   Use<'OwnerAccount', MAccountDefault> &
   Use<'VideoChannel', MChannelDefault> &
   Use<'Thumbnail', MThumbnail>
@@ -84,7 +84,7 @@ export type MVideoPlaylistAccountChannelSummary =
   Use<'VideoChannel', MChannelSummary>
 
 export type MVideoPlaylistFullSummary =
-  MVideoPlaylist &
+  MVideoPlaylistVideosLength &
   Use<'Thumbnail', MThumbnail> &
   Use<'OwnerAccount', MAccountSummary> &
   Use<'VideoChannel', MChannelSummary>