Dissociate video file names and video uuid

2 files changed, 19 insertions, 9 deletions

diff --git a/server/types/models/video/video-channels.ts b/server/types/models/video/video-channels.ts
index 2e05d8753..77790daa4 100644
--- a/server/types/models/video/video-channels.ts
+++ b/server/types/models/video/video-channels.ts
@@ -17,6 +17,7 @@ import {
   MActorDefault,
   MActorDefaultLight,
   MActorFormattable,
+  MActorHost,
   MActorLight,
   MActorSummary,
   MActorSummaryFormattable, MActorUrl
@@ -71,6 +72,10 @@ export type MChannelAccountLight =
   Use<'Actor', MActorDefaultLight> &
   Use<'Account', MAccountLight>
 
+export type MChannelHost =
+  MChannelId &
+  Use<'Actor', MActorHost>
+
 // ############################################################################
 
 // Account associations
diff --git a/server/types/models/video/video.ts b/server/types/models/video/video.ts
index ae23cc30f..92dcbaf59 100644
--- a/server/types/models/video/video.ts
+++ b/server/types/models/video/video.ts
@@ -1,27 +1,28 @@
-import { VideoModel } from '../../../models/video/video'
 import { PickWith, PickWithOpt } from '@shared/core-utils'
+import { VideoModel } from '../../../models/video/video'
+import { MUserVideoHistoryTime } from '../user/user-video-history'
+import { MScheduleVideoUpdate } from './schedule-video-update'
+import { MTag } from './tag'
+import { MThumbnail } from './thumbnail'
+import { MVideoBlacklist, MVideoBlacklistLight, MVideoBlacklistUnfederated } from './video-blacklist'
+import { MVideoCaptionLanguage, MVideoCaptionLanguageUrl } from './video-caption'
 import {
   MChannelAccountDefault,
   MChannelAccountLight,
   MChannelAccountSummaryFormattable,
   MChannelActor,
   MChannelFormattable,
+  MChannelHost,
   MChannelUserId
 } from './video-channels'
-import { MTag } from './tag'
-import { MVideoCaptionLanguage, MVideoCaptionLanguageUrl } from './video-caption'
+import { MVideoFile, MVideoFileRedundanciesAll, MVideoFileRedundanciesOpt } from './video-file'
+import { MVideoLive } from './video-live'
 import {
   MStreamingPlaylistFiles,
   MStreamingPlaylistRedundancies,
   MStreamingPlaylistRedundanciesAll,
   MStreamingPlaylistRedundanciesOpt
 } from './video-streaming-playlist'
-import { MVideoFile, MVideoFileRedundanciesAll, MVideoFileRedundanciesOpt } from './video-file'
-import { MThumbnail } from './thumbnail'
-import { MVideoBlacklist, MVideoBlacklistLight, MVideoBlacklistUnfederated } from './video-blacklist'
-import { MScheduleVideoUpdate } from './schedule-video-update'
-import { MUserVideoHistoryTime } from '../user/user-video-history'
-import { MVideoLive } from './video-live'
 
 type Use<K extends keyof VideoModel, M> = PickWith<VideoModel, K, M>
 
@@ -143,6 +144,10 @@ export type MVideoWithChannelActor =
   MVideo &
   Use<'VideoChannel', MChannelActor>
 
+export type MVideoWithHost =
+  MVideo &
+  Use<'VideoChannel', MChannelHost>
+
 export type MVideoFullLight =
   MVideo &
   Use<'Thumbnails', MThumbnail[]> &