Stronger model typings

40 files changed, 741 insertions, 34 deletions

diff --git a/server/typings/models/account/account-blocklist.ts b/server/typings/models/account/account-blocklist.ts
new file mode 100644
index 000000000..6d1771de8
--- /dev/null
+++ b/server/typings/models/account/account-blocklist.ts
@@ -0,0 +1,11 @@
+import { AccountBlocklistModel } from '../../../models/account/account-blocklist'
+import { PickWith } from '../../utils'
+import { MAccountDefault } from './account'
+
+export type MAccountBlocklist = Omit<AccountBlocklistModel, 'ByAccount' | 'BlockedAccount'>
+
+export type MAccountBlocklistId = Pick<AccountBlocklistModel, 'id'>
+
+export type MAccountBlocklistAccounts = MAccountBlocklist &
+  PickWith<AccountBlocklistModel, 'ByAccount', MAccountDefault> &
+  PickWith<AccountBlocklistModel, 'BlockedAccount', MAccountDefault>
diff --git a/server/typings/models/account/account.ts b/server/typings/models/account/account.ts
new file mode 100644
index 000000000..f3646d510
--- /dev/null
+++ b/server/typings/models/account/account.ts
@@ -0,0 +1,56 @@
+import { AccountModel } from '../../../models/account/account'
+import {
+  MActor,
+  MActorAccountChannelId,
+  MActorAPI,
+  MActorAudience,
+  MActorDefault,
+  MActorDefaultLight, MActorId,
+  MActorServer,
+  MActorSummary,
+  MActorUrl
+} from './actor'
+import { PickWith } from '../../utils'
+import { MAccountBlocklistId } from './account-blocklist'
+import { MChannelDefault } from '@server/typings/models'
+
+export type MAccountId = Pick<AccountModel, 'id'>
+export type MAccountIdActor = MAccountId &
+  PickWith<AccountModel, 'Actor', MActorAccountChannelId>
+export type MAccountIdActorId = MAccountId &
+  PickWith<AccountModel, 'Actor', MActorId>
+
+export type MAccount = Omit<AccountModel, 'Actor' | 'User' | 'Application' | 'VideoChannels' | 'VideoPlaylists' |
+  'VideoComments' | 'BlockedAccounts'>
+
+// Default scope
+export type MAccountDefault = MAccount &
+  PickWith<AccountModel, 'Actor', MActorDefault>
+
+export type MAccountDefaultChannelDefault = MAccountDefault &
+  PickWith<AccountModel, 'VideoChannels', MChannelDefault[]>
+
+export type MAccountLight = MAccount &
+  PickWith<AccountModel, 'Actor', MActorDefaultLight>
+
+export type MAccountUserId = Pick<MAccount, 'userId'>
+
+export type MAccountActor = MAccount &
+  PickWith<AccountModel, 'Actor', MActor>
+export type MAccountServer = MAccountActor &
+  PickWith<AccountModel, 'Actor', MActorServer>
+
+export type MAccountActorDefault = MAccount &
+  PickWith<AccountModel, 'Actor', MActorDefault>
+
+export type MAccountSummary = Pick<MAccount, 'id' | 'name'> &
+  PickWith<AccountModel, 'Actor', MActorSummary>
+
+export type MAccountBlocks = MAccountSummary &
+  PickWith<AccountModel, 'BlockedAccounts', MAccountBlocklistId[]>
+
+export type MAccountAPI = MAccountDefault &
+  PickWith<AccountModel, 'Actor', MActorAPI>
+
+export type MAccountUrl = PickWith<AccountModel, 'Actor', MActorUrl>
+export type MAccountAudience = PickWith<AccountModel, 'Actor', MActorAudience>
diff --git a/server/typings/models/account/actor-follow.ts b/server/typings/models/account/actor-follow.ts
new file mode 100644
index 000000000..96c53d857
--- /dev/null
+++ b/server/typings/models/account/actor-follow.ts
@@ -0,0 +1,27 @@
+import { ActorFollowModel } from '../../../models/activitypub/actor-follow'
+import { MActor, MActorAccountChannel, MActorChannel, MActorChannelAccount, MActorDefault, MActorHost, MActorUsername } from './actor'
+import { PickWith } from '../../utils'
+
+export type MActorFollow = Omit<ActorFollowModel, 'ActorFollower' | 'ActorFollowing'>
+
+export type MActorFollowActors = MActorFollow &
+  PickWith<ActorFollowModel, 'ActorFollower', MActor> &
+  PickWith<ActorFollowModel, 'ActorFollowing', MActor>
+
+export type MActorFollowActorsDefault = MActorFollow &
+  PickWith<ActorFollowModel, 'ActorFollower', MActorDefault> &
+  PickWith<ActorFollowModel, 'ActorFollowing', MActorDefault>
+
+export type MActorFollowActorsDefaultSubscription = MActorFollow &
+  PickWith<ActorFollowModel, 'ActorFollower', MActorDefault> &
+  PickWith<ActorFollowModel, 'ActorFollowing', MActorDefault & MActorChannel>
+
+export type MActorFollowFull = MActorFollow &
+  PickWith<ActorFollowModel, 'ActorFollower', MActorAccountChannel> &
+  PickWith<ActorFollowModel, 'ActorFollowing', MActorAccountChannel>
+
+export type MActorFollowFollowingHost = MActorFollow &
+  PickWith<ActorFollowModel, 'ActorFollowing', MActorUsername & MActorHost>
+
+export type MActorFollowSubscriptions = MActorFollow &
+  PickWith<ActorFollowModel, 'ActorFollowing', MActorChannelAccount>
diff --git a/server/typings/models/account/actor.ts b/server/typings/models/account/actor.ts
new file mode 100644
index 000000000..f3e752a98
--- /dev/null
+++ b/server/typings/models/account/actor.ts
@@ -0,0 +1,74 @@
+import { ActorModel } from '../../../models/activitypub/actor'
+import { PickWith } from '../../utils'
+import { MAccount, MAccountActorDefault, MAccountId, MAccountIdActor } from './account'
+import { MServerHost, MServerHostBlocks, MServer } from '../server'
+import { MAvatar } from './avatar'
+import { MChannel, MChannelAccountActor, MChannelActorAccountDefault, MChannelId, MChannelIdActor } from '../video'
+
+export type MActor = Omit<ActorModel, 'Account' | 'VideoChannel' | 'ActorFollowing' | 'Avatar' | 'ActorFollowers' | 'Server'>
+
+export type MActorUrl = Pick<MActor, 'url'>
+export type MActorId = Pick<MActor, 'id'>
+export type MActorUsername = Pick<MActor, 'preferredUsername'>
+export type MActorHost = PickWith<ActorModel, 'Server', MServerHost>
+
+export type MActorFollowersUrl = Pick<MActor, 'followersUrl'>
+export type MActorAudience = MActorUrl & MActorFollowersUrl
+
+export type MActorLight = Omit<MActor, 'privateKey' | 'privateKey'>
+
+export type MActorDefaultLight = MActorLight &
+  MActorHost &
+  PickWith<ActorModel, 'Avatar', MAvatar>
+
+export type MActorAccountId = MActor &
+  PickWith<ActorModel, 'Account', MAccountId>
+export type MActorAccountIdActor = MActor &
+  PickWith<ActorModel, 'Account', MAccountIdActor>
+
+export type MActorChannelId = MActor &
+  PickWith<ActorModel, 'VideoChannel', MChannelId>
+export type MActorChannelIdActor = MActor &
+  PickWith<ActorModel, 'VideoChannel', MChannelIdActor>
+
+export type MActorAccountChannelId = MActorAccountId & MActorChannelId
+export type MActorAccountChannelIdActor = MActorAccountIdActor & MActorChannelIdActor
+
+export type MActorAccount = MActor &
+  PickWith<ActorModel, 'Account', MAccount>
+
+export type MActorChannel = MActor &
+  PickWith<ActorModel, 'VideoChannel', MChannel>
+
+export type MActorAccountChannel = MActorAccount & MActorChannel
+
+export type MActorChannelAccount = MActor &
+  PickWith<ActorModel, 'VideoChannel', MChannelAccountActor>
+
+export type MActorServer = MActor &
+  PickWith<ActorModel, 'Server', MServer>
+
+export type MActorDefault = MActorServer &
+  PickWith<ActorModel, 'Avatar', MAvatar>
+
+export type MActorFull = MActorDefault &
+  PickWith<ActorModel, 'Account', MAccount> &
+  PickWith<ActorModel, 'VideoChannel', MChannelAccountActor>
+
+export type MActorFullActor = MActorDefault &
+  PickWith<ActorModel, 'Account', MAccountActorDefault> &
+  PickWith<ActorModel, 'VideoChannel', MChannelActorAccountDefault>
+
+export type MActorSummary = Pick<MActor, 'id' | 'preferredUsername' | 'url' | 'serverId' | 'avatarId'> &
+  MActorHost &
+  PickWith<ActorModel, 'Avatar', MAvatar>
+
+export type MActorSummaryBlocks = Omit<MActorSummary, 'Server'> &
+  PickWith<ActorModel, 'Server', MServerHostBlocks>
+
+export type MActorFollowerException = Pick<ActorModel, 'sharedInboxUrl' | 'inboxUrl'>
+
+export type MActorAPI = Omit<MActorDefault, 'publicKey' | 'privateKey' | 'inboxUrl' | 'outboxUrl' | 'sharedInboxUrl' |
+  'followersUrl' | 'followingUrl' | 'url' | 'createdAt' | 'updatedAt'>
+
+export type MActorSignature = MActorAccountChannelId
diff --git a/server/typings/models/account/avatar.ts b/server/typings/models/account/avatar.ts
new file mode 100644
index 000000000..257c48bfc
--- /dev/null
+++ b/server/typings/models/account/avatar.ts
@@ -0,0 +1,3 @@
+import { AvatarModel } from '../../../models/avatar/avatar'
+
+export type MAvatar = AvatarModel
diff --git a/server/typings/models/account/index.d.ts b/server/typings/models/account/index.d.ts
new file mode 100644
index 000000000..513c09c40
--- /dev/null
+++ b/server/typings/models/account/index.d.ts
@@ -0,0 +1,5 @@
+export * from './account'
+export * from './account-blocklist'
+export * from './actor'
+export * from './actor-follow'
+export * from './avatar'
diff --git a/server/typings/models/actor-follow.ts b/server/typings/models/actor-follow.ts
deleted file mode 100644
index 952ef877b..000000000
--- a/server/typings/models/actor-follow.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { ActorFollowModel } from '../../models/activitypub/actor-follow'
-import { ActorModelOnly } from './actor'
-
-export type ActorFollowModelOnly = Omit<ActorFollowModel, 'ActorFollower' | 'ActorFollowing'>
-export type ActorFollowModelLight = ActorFollowModelOnly & {
-  ActorFollower: ActorModelOnly
-  ActorFollowing: ActorModelOnly
-}
diff --git a/server/typings/models/actor.ts b/server/typings/models/actor.ts
deleted file mode 100644
index 2656c7b66..000000000
--- a/server/typings/models/actor.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import { ActorModel } from '../../models/activitypub/actor'
-import { VideoChannelModel } from '../../models/video/video-channel'
-import { AccountModel } from '../../models/account/account'
-import { FunctionProperties } from '../utils'
-
-export type VideoChannelModelId = FunctionProperties<VideoChannelModel>
-export type AccountModelId = FunctionProperties<AccountModel> | Pick<AccountModel, 'id'>
-
-export type VideoChannelModelIdActor = VideoChannelModelId & Pick<VideoChannelModel, 'Actor'>
-export type AccountModelIdActor = AccountModelId & Pick<AccountModel, 'Actor'>
-
-export type ActorModelUrl = Pick<ActorModel, 'url'>
-export type ActorModelOnly = Omit<ActorModel, 'Account' | 'VideoChannel' | 'ActorFollowing' | 'Avatar' | 'ActorFollowers' | 'Server'>
-export type ActorModelId = Pick<ActorModelOnly, 'id'>
-
-export type SignatureActorModel = ActorModelOnly & {
-  VideoChannel: VideoChannelModelIdActor
-
-  Account: AccountModelIdActor
-}
-
-export type ActorFollowerException = Pick<ActorModel, 'sharedInboxUrl' | 'inboxUrl'>
diff --git a/server/typings/models/index.d.ts b/server/typings/models/index.d.ts
index c90656965..39e82e4a8 100644
--- a/server/typings/models/index.d.ts
+++ b/server/typings/models/index.d.ts
@@ -1 +1,4 @@
-export * from './actor'
+export * from './account'
+export * from './server'
+export * from './user'
+export * from './video'
diff --git a/server/typings/models/oauth/oauth-client.ts b/server/typings/models/oauth/oauth-client.ts
new file mode 100644
index 000000000..904a07863
--- /dev/null
+++ b/server/typings/models/oauth/oauth-client.ts
@@ -0,0 +1,3 @@
+import { OAuthClientModel } from '@server/models/oauth/oauth-client'
+
+export type MOAuthClient = Omit<OAuthClientModel, 'OAuthTokens'>
diff --git a/server/typings/models/oauth/oauth-token.ts b/server/typings/models/oauth/oauth-token.ts
new file mode 100644
index 000000000..105ea3df3
--- /dev/null
+++ b/server/typings/models/oauth/oauth-token.ts
@@ -0,0 +1,9 @@
+import { OAuthTokenModel } from '@server/models/oauth/oauth-token'
+import { PickWith } from '@server/typings/utils'
+import { MUserAccountUrl } from '@server/typings/models'
+
+export type MOAuthToken = Omit<OAuthTokenModel, 'User' | 'OAuthClients'>
+
+export type MOAuthTokenUser = MOAuthToken &
+  PickWith<OAuthTokenModel, 'User', MUserAccountUrl> &
+  { user?: MUserAccountUrl }
diff --git a/server/typings/models/server/index.d.ts b/server/typings/models/server/index.d.ts
new file mode 100644
index 000000000..c853795ad
--- /dev/null
+++ b/server/typings/models/server/index.d.ts
@@ -0,0 +1,3 @@
+export * from './plugin'
+export * from './server'
+export * from './server-blocklist'
diff --git a/server/typings/models/server/plugin.ts b/server/typings/models/server/plugin.ts
new file mode 100644
index 000000000..b1e2e149d
--- /dev/null
+++ b/server/typings/models/server/plugin.ts
@@ -0,0 +1,3 @@
+import { PluginModel } from '@server/models/server/plugin'
+
+export type MPlugin = PluginModel
diff --git a/server/typings/models/server/server-blocklist.ts b/server/typings/models/server/server-blocklist.ts
new file mode 100644
index 000000000..38065f382
--- /dev/null
+++ b/server/typings/models/server/server-blocklist.ts
@@ -0,0 +1,9 @@
+import { ServerBlocklistModel } from '@server/models/server/server-blocklist'
+import { PickWith } from '@server/typings/utils'
+import { MAccountDefault, MServer } from '@server/typings/models'
+
+export type MServerBlocklist = Omit<ServerBlocklistModel, 'ByAccount' | 'BlockedServer'>
+
+export type MServerBlocklistAccountServer = MServerBlocklist &
+  PickWith<ServerBlocklistModel, 'ByAccount', MAccountDefault> &
+  PickWith<ServerBlocklistModel, 'BlockedServer', MServer>
diff --git a/server/typings/models/server/server.ts b/server/typings/models/server/server.ts
new file mode 100644
index 000000000..6be7bf9bb
--- /dev/null
+++ b/server/typings/models/server/server.ts
@@ -0,0 +1,10 @@
+import { ServerModel } from '../../../models/server/server'
+import { PickWith } from '../../utils'
+import { MAccountBlocklistId } from '../account'
+
+export type MServer = Omit<ServerModel, 'Actors' | 'BlockedByAccounts'>
+
+export type MServerHost = Pick<MServer, 'host'>
+
+export type MServerHostBlocks = MServerHost &
+  PickWith<ServerModel, 'BlockedByAccounts', MAccountBlocklistId[]>
diff --git a/server/typings/models/user/index.d.ts b/server/typings/models/user/index.d.ts
new file mode 100644
index 000000000..e3353d0b1
--- /dev/null
+++ b/server/typings/models/user/index.d.ts
@@ -0,0 +1,3 @@
+export * from './user'
+export * from './user-notification'
+export * from './user-video-history'
diff --git a/server/typings/models/user/user-notification-setting.ts b/server/typings/models/user/user-notification-setting.ts
new file mode 100644
index 000000000..585d30a66
--- /dev/null
+++ b/server/typings/models/user/user-notification-setting.ts
@@ -0,0 +1,3 @@
+import { UserNotificationSettingModel } from '@server/models/account/user-notification-setting'
+
+export type MNotificationSetting = Omit<UserNotificationSettingModel, 'User'>
diff --git a/server/typings/models/user/user-notification.ts b/server/typings/models/user/user-notification.ts
new file mode 100644
index 000000000..b872c5dc5
--- /dev/null
+++ b/server/typings/models/user/user-notification.ts
@@ -0,0 +1,69 @@
+import { UserNotificationModel } from '../../../models/account/user-notification'
+import { PickWith } from '../../utils'
+import { VideoModel } from '../../../models/video/video'
+import { ActorModel } from '../../../models/activitypub/actor'
+import { ServerModel } from '../../../models/server/server'
+import { AvatarModel } from '../../../models/avatar/avatar'
+import { VideoChannelModel } from '../../../models/video/video-channel'
+import { AccountModel } from '../../../models/account/account'
+import { VideoCommentModel } from '../../../models/video/video-comment'
+import { VideoAbuseModel } from '../../../models/video/video-abuse'
+import { VideoBlacklistModel } from '../../../models/video/video-blacklist'
+import { VideoImportModel } from '../../../models/video/video-import'
+import { ActorFollowModel } from '../../../models/activitypub/actor-follow'
+
+export namespace UserNotificationIncludes {
+  export type VideoInclude = Pick<VideoModel, 'id' | 'uuid' | 'name'>
+  export type VideoIncludeChannel = VideoInclude &
+    PickWith<VideoModel, 'VideoChannel', VideoChannelIncludeActor>
+
+  export type ActorInclude = Pick<ActorModel, 'preferredUsername' | 'getHost'> &
+    PickWith<ActorModel, 'Avatar', Pick<AvatarModel, 'filename' | 'getStaticPath'>> &
+    PickWith<ActorModel, 'Server', Pick<ServerModel, 'host'>>
+
+  export type VideoChannelInclude = Pick<VideoChannelModel, 'id' | 'name' | 'getDisplayName'>
+  export type VideoChannelIncludeActor = VideoChannelInclude &
+    PickWith<VideoChannelModel, 'Actor', ActorInclude>
+
+  export type AccountInclude = Pick<AccountModel, 'id' | 'name' | 'getDisplayName'>
+  export type AccountIncludeActor = AccountInclude &
+    PickWith<AccountModel, 'Actor', ActorInclude>
+
+  export type VideoCommentInclude = Pick<VideoCommentModel, 'id' | 'originCommentId' | 'getThreadId'> &
+    PickWith<VideoCommentModel, 'Account', AccountIncludeActor> &
+    PickWith<VideoCommentModel, 'Video', VideoInclude>
+
+  export type VideoAbuseInclude = Pick<VideoAbuseModel, 'id'> &
+    PickWith<VideoAbuseModel, 'Video', VideoInclude>
+
+  export type VideoBlacklistInclude = Pick<VideoBlacklistModel, 'id'> &
+    PickWith<VideoAbuseModel, 'Video', VideoInclude>
+
+  export type VideoImportInclude = Pick<VideoImportModel, 'id' | 'magnetUri' | 'targetUrl' | 'torrentName'> &
+    PickWith<VideoImportModel, 'Video', VideoInclude>
+
+  export type ActorFollower = Pick<ActorModel, 'preferredUsername' | 'getHost'> &
+    PickWith<ActorModel, 'Account', AccountInclude> &
+    PickWith<ActorModel, 'Avatar', Pick<AvatarModel, 'filename' | 'getStaticPath'>> &
+    PickWith<ActorModel, 'Server', Pick<ServerModel, 'host'>>
+
+  export type ActorFollowing = Pick<ActorModel, 'preferredUsername'> &
+    PickWith<ActorModel, 'VideoChannel', VideoChannelInclude> &
+    PickWith<ActorModel, 'Account', AccountInclude>
+
+  export type ActorFollowInclude = Pick<ActorFollowModel, 'id' | 'state'> &
+    PickWith<ActorFollowModel, 'ActorFollower', ActorFollower> &
+    PickWith<ActorFollowModel, 'ActorFollowing', ActorFollowing>
+}
+
+export type UserNotificationModelOnly = Omit<UserNotificationModel, 'User' | 'Video' | 'Comment' | 'VideoAbuse' | 'VideoBlacklist' |
+  'VideoImport' | 'Account' | 'ActorFollow'>
+
+export type UserNotificationModelForApi = UserNotificationModelOnly &
+  PickWith<UserNotificationModel, 'Video', UserNotificationIncludes.VideoIncludeChannel> &
+  PickWith<UserNotificationModel, 'Comment', UserNotificationIncludes.VideoCommentInclude> &
+  PickWith<UserNotificationModel, 'VideoAbuse', UserNotificationIncludes.VideoAbuseInclude> &
+  PickWith<UserNotificationModel, 'VideoBlacklist', UserNotificationIncludes.VideoBlacklistInclude> &
+  PickWith<UserNotificationModel, 'VideoImport', UserNotificationIncludes.VideoImportInclude> &
+  PickWith<UserNotificationModel, 'ActorFollow', UserNotificationIncludes.ActorFollowInclude> &
+  PickWith<UserNotificationModel, 'Account', UserNotificationIncludes.AccountIncludeActor>
diff --git a/server/typings/models/user/user-video-history.ts b/server/typings/models/user/user-video-history.ts
new file mode 100644
index 000000000..62673ab1b
--- /dev/null
+++ b/server/typings/models/user/user-video-history.ts
@@ -0,0 +1,5 @@
+import { UserVideoHistoryModel } from '../../../models/account/user-video-history'
+
+export type MUserVideoHistory = Omit<UserVideoHistoryModel, 'Video' | 'User'>
+
+export type MUserVideoHistoryTime = Pick<MUserVideoHistory, 'currentTime'>
diff --git a/server/typings/models/user/user.ts b/server/typings/models/user/user.ts
new file mode 100644
index 000000000..b91eed8d9
--- /dev/null
+++ b/server/typings/models/user/user.ts
@@ -0,0 +1,32 @@
+import { UserModel } from '../../../models/account/user'
+import { PickWith } from '../../utils'
+import { MAccount, MAccountDefault, MAccountDefaultChannelDefault, MAccountId, MAccountIdActorId, MAccountUrl } from '../account'
+import { MNotificationSetting } from './user-notification-setting'
+
+export type MUser = Omit<UserModel, 'Account' | 'NotificationSetting' | 'VideoImports' | 'OAuthTokens'>
+
+export type MUserId = Pick<UserModel, 'id'>
+
+export type MUserWithNotificationSetting = MUser &
+  PickWith<UserModel, 'NotificationSetting', MNotificationSetting>
+
+export type MUserAccountDefault = MUser &
+  PickWith<UserModel, 'Account', MAccountDefault>
+
+export type MUserAccount = MUser &
+  PickWith<UserModel, 'Account', MAccount>
+
+export type MUserAccountId = MUser &
+  PickWith<UserModel, 'Account', MAccountId>
+
+export type MUserNotifSettingAccount = MUserWithNotificationSetting & MUserAccount
+
+export type MUserDefault = MUser &
+  MUserWithNotificationSetting &
+  MUserAccountDefault
+
+export type MUserChannel = MUserWithNotificationSetting &
+  PickWith<UserModel, 'Account', MAccountDefaultChannelDefault>
+
+export type MUserAccountUrl = MUser &
+  PickWith<UserModel, 'Account', MAccountUrl & MAccountIdActorId>
diff --git a/server/typings/models/video-share.ts b/server/typings/models/video-share.ts
deleted file mode 100644
index 1406749d2..000000000
--- a/server/typings/models/video-share.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { VideoShareModel } from '../../models/video/video-share'
-
-export type VideoShareModelOnly = Omit<VideoShareModel, 'Actor' | 'Video'>
diff --git a/server/typings/models/video/index.d.ts b/server/typings/models/video/index.d.ts
new file mode 100644
index 000000000..528e9d274
--- /dev/null
+++ b/server/typings/models/video/index.d.ts
@@ -0,0 +1,14 @@
+export * from './schedule-video-update'
+export * from './tag'
+export * from './thumbnail'
+export * from './video'
+export * from './video-abuse'
+export * from './video-blacklist'
+export * from './video-caption'
+export * from './video-channels'
+export * from './video-comment'
+export * from './video-file'
+export * from './video-playlist'
+export * from './video-redundancy'
+export * from './video-share'
+export * from './video-streaming-playlist'
diff --git a/server/typings/models/video/schedule-video-update.ts b/server/typings/models/video/schedule-video-update.ts
new file mode 100644
index 000000000..069705536
--- /dev/null
+++ b/server/typings/models/video/schedule-video-update.ts
@@ -0,0 +1,3 @@
+import { ScheduleVideoUpdateModel } from '../../../models/video/schedule-video-update'
+
+export type MScheduleVideoUpdate = Omit<ScheduleVideoUpdateModel, 'Video'>
diff --git a/server/typings/models/video/tag.ts b/server/typings/models/video/tag.ts
new file mode 100644
index 000000000..64a68873e
--- /dev/null
+++ b/server/typings/models/video/tag.ts
@@ -0,0 +1,3 @@
+import { TagModel } from '../../../models/video/tag'
+
+export type MTag = Omit<TagModel, 'Videos'>
diff --git a/server/typings/models/video/thumbnail.ts b/server/typings/models/video/thumbnail.ts
new file mode 100644
index 000000000..c03ba55ac
--- /dev/null
+++ b/server/typings/models/video/thumbnail.ts
@@ -0,0 +1,3 @@
+import { ThumbnailModel } from '../../../models/video/thumbnail'
+
+export type MThumbnail = Omit<ThumbnailModel, 'Video' | 'VideoPlaylist'>
diff --git a/server/typings/models/video/video-abuse.ts b/server/typings/models/video/video-abuse.ts
new file mode 100644
index 000000000..1667ae55a
--- /dev/null
+++ b/server/typings/models/video/video-abuse.ts
@@ -0,0 +1,15 @@
+import { VideoAbuseModel } from '../../../models/video/video-abuse'
+import { PickWith } from '../../utils'
+import { MVideo } from './video'
+import { MAccountDefault } from '../account'
+
+export type MVideoAbuse = Omit<VideoAbuseModel, 'Account' | 'Video' | 'toActivityPubObject'>
+
+export type MVideoAbuseId = Pick<VideoAbuseModel, 'id'>
+
+export type MVideoAbuseVideo = MVideoAbuse &
+  Pick<VideoAbuseModel, 'toActivityPubObject'> &
+  PickWith<VideoAbuseModel, 'Video', MVideo>
+
+export type MVideoAbuseAccountVideo = MVideoAbuseVideo &
+  PickWith<VideoAbuseModel, 'Account', MAccountDefault>
diff --git a/server/typings/models/video/video-blacklist.ts b/server/typings/models/video/video-blacklist.ts
new file mode 100644
index 000000000..9242b357d
--- /dev/null
+++ b/server/typings/models/video/video-blacklist.ts
@@ -0,0 +1,11 @@
+import { VideoBlacklistModel } from '../../../models/video/video-blacklist'
+import { PickWith } from '@server/typings/utils'
+import { MVideo } from '@server/typings/models'
+
+export type MVideoBlacklist = Omit<VideoBlacklistModel, 'Video'>
+
+export type MVideoBlacklistLight = Pick<MVideoBlacklist, 'id' | 'reason' | 'unfederated'>
+export type MVideoBlacklistUnfederated = Pick<MVideoBlacklist, 'unfederated'>
+
+export type MVideoBlacklistVideo = MVideoBlacklist &
+  PickWith<VideoBlacklistModel, 'Video', MVideo>
diff --git a/server/typings/models/video/video-caption.ts b/server/typings/models/video/video-caption.ts
new file mode 100644
index 000000000..16d8b7392
--- /dev/null
+++ b/server/typings/models/video/video-caption.ts
@@ -0,0 +1,10 @@
+import { VideoCaptionModel } from '../../../models/video/video-caption'
+import { PickWith } from '@server/typings/utils'
+import { VideoModel } from '@server/models/video/video'
+
+export type MVideoCaption = Omit<VideoCaptionModel, 'Video'>
+
+export type MVideoCaptionLanguage = Pick<MVideoCaption, 'language'>
+
+export type MVideoCaptionVideo = MVideoCaption &
+  PickWith<VideoCaptionModel, 'Video', Pick<VideoModel, 'id' | 'remote' | 'uuid'>>
diff --git a/server/typings/models/video/video-change-ownership.ts b/server/typings/models/video/video-change-ownership.ts
new file mode 100644
index 000000000..718515e2d
--- /dev/null
+++ b/server/typings/models/video/video-change-ownership.ts
@@ -0,0 +1,10 @@
+import { VideoChangeOwnershipModel } from '@server/models/video/video-change-ownership'
+import { PickWith } from '@server/typings/utils'
+import { MAccountDefault, MVideoWithFileThumbnail } from '@server/typings/models'
+
+export type MVideoChangeOwnership = Omit<VideoChangeOwnershipModel, 'Initiator' | 'NextOwner' | 'Video'>
+
+export type MVideoChangeOwnershipFull = MVideoChangeOwnership &
+  PickWith<VideoChangeOwnershipModel, 'Initiator', MAccountDefault> &
+  PickWith<VideoChangeOwnershipModel, 'NextOwner', MAccountDefault> &
+  PickWith<VideoChangeOwnershipModel, 'Video', MVideoWithFileThumbnail>
diff --git a/server/typings/models/video/video-channels.ts b/server/typings/models/video/video-channels.ts
new file mode 100644
index 000000000..e10bd6842
--- /dev/null
+++ b/server/typings/models/video/video-channels.ts
@@ -0,0 +1,70 @@
+import { FunctionProperties, PickWith } from '../../utils'
+import { VideoChannelModel } from '../../../models/video/video-channel'
+import {
+  MAccountActor,
+  MAccountAPI,
+  MAccountBlocks,
+  MAccountDefault,
+  MAccountLight,
+  MAccountUserId,
+  MActor,
+  MActorAccountChannelId,
+  MActorAPI,
+  MActorDefault,
+  MActorDefaultLight, MActorLight,
+  MActorSummary
+} from '../account'
+import { MVideo } from './video'
+
+export type MChannelId = FunctionProperties<VideoChannelModel>
+export type MChannelIdActor = MChannelId &
+  PickWith<VideoChannelModel, 'Actor', MActorAccountChannelId>
+
+export type MChannel = Omit<VideoChannelModel, 'Actor' | 'Account' | 'Videos' | 'VideoPlaylists'>
+
+export type MChannelUserId = Pick<MChannel, 'accountId'> &
+  PickWith<VideoChannelModel, 'Account', MAccountUserId>
+
+// Default scope
+export type MChannelDefault = MChannel &
+  PickWith<VideoChannelModel, 'Actor', MActorDefault>
+
+export type MChannelLight = MChannel &
+  PickWith<VideoChannelModel, 'Actor', MActorDefaultLight>
+
+export type MChannelAccountLight = MChannel &
+  PickWith<VideoChannelModel, 'Actor', MActorDefaultLight> &
+  PickWith<VideoChannelModel, 'Account', MAccountLight>
+
+export type MChannelSummary = Pick<MChannel, 'id' | 'name' | 'description' | 'actorId'> &
+  PickWith<VideoChannelModel, 'Actor', MActorSummary>
+
+export type MChannelSummaryAccount = MChannelSummary &
+  PickWith<VideoChannelModel, 'Account', MAccountBlocks>
+
+export type MChannelAPI = MChannel &
+  PickWith<VideoChannelModel, 'Actor', MActorAPI> &
+  PickWith<VideoChannelModel, 'Account', MAccountAPI>
+
+export type MChannelAccountActor = MChannel &
+  PickWith<VideoChannelModel, 'Account', MAccountActor>
+export type MChannelAccountDefault = MChannelActor &
+  PickWith<VideoChannelModel, 'Account', MAccountDefault>
+
+export type MChannelVideos = MChannel &
+  PickWith<VideoChannelModel, 'Videos', MVideo[]>
+
+export type MChannelActor = MChannel &
+  PickWith<VideoChannelModel, 'Actor', MActor>
+export type MChannelActorLight = MChannel &
+  PickWith<VideoChannelModel, 'Actor', MActorLight>
+export type MChannelActorDefault = MChannel &
+  PickWith<VideoChannelModel, 'Actor', MActorDefault>
+
+export type MChannelActorAccountActor = MChannelAccountActor & MChannelActor
+
+export type MChannelActorAccountDefault = MChannel &
+  PickWith<VideoChannelModel, 'Actor', MActorDefault> &
+  PickWith<VideoChannelModel, 'Account', MAccountDefault>
+
+export type MChannelActorAccountDefaultVideos = MChannelActorAccountDefault & MChannelVideos
diff --git a/server/typings/models/video/video-comment.ts b/server/typings/models/video/video-comment.ts
new file mode 100644
index 000000000..675613804
--- /dev/null
+++ b/server/typings/models/video/video-comment.ts
@@ -0,0 +1,29 @@
+import { VideoCommentModel } from '../../../models/video/video-comment'
+import { PickWith } from '../../utils'
+import { MAccountDefault } from '../account'
+import { MVideoAccountDefault, MVideoAccountLight, MVideoFeed, MVideoIdUrl } from './video'
+
+export type MComment = Omit<VideoCommentModel, 'OriginVideoComment' | 'InReplyToVideoComment' | 'Video' | 'Account'>
+export type MCommentId = Pick<MComment, 'id'>
+
+export type MCommentAPI = MComment & { totalReplies: number }
+
+export type MCommentOwner = MComment &
+  PickWith<VideoCommentModel, 'Account', MAccountDefault>
+
+export type MCommentVideo = MComment &
+  PickWith<VideoCommentModel, 'Video', MVideoAccountLight>
+
+export type MCommentReply = MComment &
+  PickWith<VideoCommentModel, 'InReplyToVideoComment', MComment>
+
+export type MCommentOwnerReply = MCommentOwner & MCommentReply
+export type MCommentOwnerVideo = MCommentOwner & MCommentVideo
+export type MCommentReplyVideo = MCommentReply & MCommentVideo
+export type MCommentOwnerVideoReply = MCommentOwnerVideo & MCommentReply
+
+export type MCommentOwnerReplyVideoLight = MCommentOwnerReply &
+  PickWith<VideoCommentModel, 'Video', MVideoIdUrl>
+
+export type MCommentOwnerVideoFeed = MCommentOwner &
+  PickWith<VideoCommentModel, 'Video', MVideoFeed>
diff --git a/server/typings/models/video/video-file.ts b/server/typings/models/video/video-file.ts
new file mode 100644
index 000000000..afa659d1f
--- /dev/null
+++ b/server/typings/models/video/video-file.ts
@@ -0,0 +1,15 @@
+import { VideoFileModel } from '../../../models/video/video-file'
+import { PickWith, PickWithOpt } from '../../utils'
+import { MVideo, MVideoUUID } from './video'
+import { MVideoRedundancyFileUrl } from './video-redundancy'
+
+export type MVideoFile = Omit<VideoFileModel, 'Video' | 'RedundancyVideos'>
+
+export type MVideoFileVideo = MVideoFile &
+  PickWith<VideoFileModel, 'Video', MVideo>
+
+export type MVideoFileVideoUUID = MVideoFile &
+  PickWith<VideoFileModel, 'Video', MVideoUUID>
+
+export type MVideoFileRedundanciesOpt = MVideoFile &
+  PickWithOpt<VideoFileModel, 'RedundancyVideos', MVideoRedundancyFileUrl[]>
diff --git a/server/typings/models/video/video-import.ts b/server/typings/models/video/video-import.ts
new file mode 100644
index 000000000..51be900d6
--- /dev/null
+++ b/server/typings/models/video/video-import.ts
@@ -0,0 +1,15 @@
+import { VideoImportModel } from '@server/models/video/video-import'
+import { PickWith } from '@server/typings/utils'
+import { MUser, MVideo, MVideoAccountLight, MVideoTag, MVideoThumbnail, MVideoWithFile } from '@server/typings/models'
+
+export type MVideoImport = Omit<VideoImportModel, 'User' | 'Video'>
+
+export type MVideoImportDefault = MVideoImport &
+  PickWith<VideoImportModel, 'User', MUser> &
+  PickWith<VideoImportModel, 'Video', MVideoTag & MVideoAccountLight & MVideoThumbnail>
+
+export type MVideoImportDefaultFiles = MVideoImportDefault &
+  PickWith<VideoImportModel, 'Video', MVideoTag & MVideoAccountLight & MVideoThumbnail & MVideoWithFile>
+
+export type MVideoImportVideo = MVideoImport &
+  PickWith<VideoImportModel, 'Video', MVideo>
diff --git a/server/typings/models/video/video-playlist-element.ts b/server/typings/models/video/video-playlist-element.ts
new file mode 100644
index 000000000..d1b8a18a0
--- /dev/null
+++ b/server/typings/models/video/video-playlist-element.ts
@@ -0,0 +1,15 @@
+import { VideoPlaylistElementModel } from '@server/models/video/video-playlist-element'
+import { PickWith } from '@server/typings/utils'
+import { MVideoPlaylistPrivacy, MVideoThumbnail, MVideoUrl } from '@server/typings/models'
+
+export type MVideoPlaylistElement = Omit<VideoPlaylistElementModel, 'VideoPlaylist' | 'Video'>
+export type MVideoPlaylistElementId = Pick<MVideoPlaylistElement, 'id'>
+
+export type MVideoPlaylistElementLight = Pick<MVideoPlaylistElement, 'id' | 'videoId' | 'startTimestamp' | 'stopTimestamp'>
+
+export type MVideoPlaylistVideoThumbnail = MVideoPlaylistElement &
+  PickWith<VideoPlaylistElementModel, 'Video', MVideoThumbnail>
+
+export type MVideoPlaylistAP = MVideoPlaylistElement &
+  PickWith<VideoPlaylistElementModel, 'Video', MVideoUrl> &
+  PickWith<VideoPlaylistElementModel, 'VideoPlaylist', MVideoPlaylistPrivacy>
diff --git a/server/typings/models/video/video-playlist.ts b/server/typings/models/video/video-playlist.ts
new file mode 100644
index 000000000..825b3391c
--- /dev/null
+++ b/server/typings/models/video/video-playlist.ts
@@ -0,0 +1,42 @@
+import { VideoPlaylistModel } from '../../../models/video/video-playlist'
+import { PickWith } from '../../utils'
+import { MAccount, MAccountDefault, MAccountSummary } from '../account'
+import { MThumbnail } from './thumbnail'
+import { MChannelDefault, MChannelSummary } from './video-channels'
+import { MVideoPlaylistElementLight } from '@server/typings/models/video/video-playlist-element'
+
+export type MVideoPlaylist = Omit<VideoPlaylistModel, 'OwnerAccount' | 'VideoChannel' | 'VideoPlaylistElements' | 'Thumbnail'>
+export type MVideoPlaylistId = Pick<MVideoPlaylist, 'id'>
+export type MVideoPlaylistPrivacy = Pick<MVideoPlaylist, 'privacy'>
+
+export type MVideoPlaylistWithElements = MVideoPlaylist &
+  PickWith<VideoPlaylistModel, 'VideoPlaylistElements', MVideoPlaylistElementLight[]>
+export type MVideoPlaylistIdWithElements = MVideoPlaylistId & MVideoPlaylistWithElements
+
+export type MVideoPlaylistUUID = Pick<MVideoPlaylist, 'uuid'>
+
+export type MVideoPlaylistOwner = MVideoPlaylist &
+  PickWith<VideoPlaylistModel, 'OwnerAccount', MAccount>
+
+export type MVideoPlaylistOwnerDefault = MVideoPlaylist &
+  PickWith<VideoPlaylistModel, 'OwnerAccount', MAccountDefault>
+
+export type MVideoPlaylistThumbnail = MVideoPlaylist &
+  PickWith<VideoPlaylistModel, 'Thumbnail', MThumbnail>
+
+export type MVideoPlaylistAccountThumbnail = MVideoPlaylistOwnerDefault &
+  PickWith<VideoPlaylistModel, 'Thumbnail', MThumbnail>
+
+export type MVideoPlaylistAccountChannelSummary = MVideoPlaylist &
+  PickWith<VideoPlaylistModel, 'OwnerAccount', MAccountSummary> &
+  PickWith<VideoPlaylistModel, 'VideoChannel', MChannelSummary>
+
+export type MVideoPlaylistAccountChannelDefault = MVideoPlaylist &
+  PickWith<VideoPlaylistModel, 'OwnerAccount', MAccountDefault> &
+  PickWith<VideoPlaylistModel, 'VideoChannel', MChannelDefault>
+
+export type MVideoPlaylistVideosLength = MVideoPlaylist & { videosLength: number }
+
+export type MVideoPlaylistFullSummary = MVideoPlaylistAccountChannelSummary & MVideoPlaylistThumbnail
+
+export type MVideoPlaylistFull = MVideoPlaylist & MVideoPlaylistThumbnail & MVideoPlaylistAccountChannelDefault
diff --git a/server/typings/models/video/video-rate.ts b/server/typings/models/video/video-rate.ts
new file mode 100644
index 000000000..6eefe6362
--- /dev/null
+++ b/server/typings/models/video/video-rate.ts
@@ -0,0 +1,12 @@
+import { AccountVideoRateModel } from '@server/models/account/account-video-rate'
+import { PickWith } from '@server/typings/utils'
+import { MAccountAudience, MAccountUrl, MVideo } from '..'
+
+export type MAccountVideoRate = Omit<AccountVideoRateModel, 'Video' | 'Account'>
+
+export type MAccountVideoRateAccountUrl = MAccountVideoRate &
+  PickWith<AccountVideoRateModel, 'Account', MAccountUrl>
+
+export type MAccountVideoRateAccountVideo = MAccountVideoRate &
+  PickWith<AccountVideoRateModel, 'Account', MAccountAudience> &
+  PickWith<AccountVideoRateModel, 'Video', MVideo>
diff --git a/server/typings/models/video/video-redundancy.ts b/server/typings/models/video/video-redundancy.ts
new file mode 100644
index 000000000..ec61bfb68
--- /dev/null
+++ b/server/typings/models/video/video-redundancy.ts
@@ -0,0 +1,18 @@
+import { VideoRedundancyModel } from '../../../models/redundancy/video-redundancy'
+import { PickWith } from '@server/typings/utils'
+import { MStreamingPlaylistVideo, MVideoFile, MVideoFileVideo } from '@server/typings/models'
+
+export type MVideoRedundancy = Omit<VideoRedundancyModel, 'VideoFile' | 'VideoStreamingPlaylist' | 'Actor'>
+
+export type MVideoRedundancyFileUrl = Pick<MVideoRedundancy, 'fileUrl'>
+
+export type MVideoRedundancyFile = MVideoRedundancy &
+  PickWith<VideoRedundancyModel, 'VideoFile', MVideoFile>
+
+export type MVideoRedundancyFileVideo = MVideoRedundancy &
+  PickWith<VideoRedundancyModel, 'VideoFile', MVideoFileVideo>
+
+export type MVideoRedundancyStreamingPlaylistVideo = MVideoRedundancy &
+  PickWith<VideoRedundancyModel, 'VideoStreamingPlaylist', MStreamingPlaylistVideo>
+
+export type MVideoRedundancyVideo = MVideoRedundancyFileVideo | MVideoRedundancyStreamingPlaylistVideo
diff --git a/server/typings/models/video/video-share.ts b/server/typings/models/video/video-share.ts
new file mode 100644
index 000000000..7e8cb8b61
--- /dev/null
+++ b/server/typings/models/video/video-share.ts
@@ -0,0 +1,12 @@
+import { VideoShareModel } from '../../../models/video/video-share'
+import { PickWith } from '../../utils'
+import { MActorDefault } from '../account'
+import { MVideo } from './video'
+
+export type MVideoShare = Omit<VideoShareModel, 'Actor' | 'Video'>
+
+export type MVideoShareActor = MVideoShare &
+  PickWith<VideoShareModel, 'Actor', MActorDefault>
+
+export type MVideoShareFull = MVideoShareActor &
+  PickWith<VideoShareModel, 'Video', MVideo>
diff --git a/server/typings/models/video/video-streaming-playlist.ts b/server/typings/models/video/video-streaming-playlist.ts
new file mode 100644
index 000000000..5b6310771
--- /dev/null
+++ b/server/typings/models/video/video-streaming-playlist.ts
@@ -0,0 +1,12 @@
+import { VideoStreamingPlaylistModel } from '../../../models/video/video-streaming-playlist'
+import { PickWith } from '../../utils'
+import { MVideoRedundancyFileUrl } from './video-redundancy'
+import { MVideo } from '@server/typings/models'
+
+export type MStreamingPlaylist = Omit<VideoStreamingPlaylistModel, 'Video' | 'RedundancyVideos'>
+
+export type MStreamingPlaylistVideo = MStreamingPlaylist &
+  PickWith<VideoStreamingPlaylistModel, 'Video', MVideo>
+
+export type MStreamingPlaylistRedundancies = MStreamingPlaylist &
+  PickWith<VideoStreamingPlaylistModel, 'RedundancyVideos', MVideoRedundancyFileUrl[]>
diff --git a/server/typings/models/video/video.ts b/server/typings/models/video/video.ts
new file mode 100644
index 000000000..0ffd0c302
--- /dev/null
+++ b/server/typings/models/video/video.ts
@@ -0,0 +1,103 @@
+import { VideoModel } from '../../../models/video/video'
+import { PickWith, PickWithOpt } from '../../utils'
+import { MChannelAccountLight, MChannelActor, MChannelActorAccountDefault, MChannelUserId } from './video-channels'
+import { MTag } from './tag'
+import { MVideoCaptionLanguage } from './video-caption'
+import { MStreamingPlaylist, MStreamingPlaylistRedundancies } from './video-streaming-playlist'
+import { MVideoFile, MVideoFileRedundanciesOpt } from './video-file'
+import { MThumbnail } from './thumbnail'
+import { MVideoBlacklistLight, MVideoBlacklistUnfederated } from './video-blacklist'
+import { MScheduleVideoUpdate } from './schedule-video-update'
+import { MUserVideoHistoryTime } from '../user/user-video-history'
+
+export type MVideo = Omit<VideoModel, 'VideoChannel' | 'Tags' | 'Thumbnails' | 'VideoPlaylistElements' | 'VideoAbuses' |
+  'VideoFiles' | 'VideoStreamingPlaylists' | 'VideoShares' | 'AccountVideoRates' | 'VideoComments' | 'VideoViews' | 'UserVideoHistories' |
+  'ScheduleVideoUpdate' | 'VideoBlacklist' | 'VideoImport' | 'VideoCaptions'>
+
+export type MVideoId = Pick<MVideo, 'id'>
+export type MVideoUrl = Pick<MVideo, 'url'>
+export type MVideoUUID = Pick<MVideo, 'uuid'>
+
+export type MVideoIdUrl = MVideoId & MVideoUrl
+export type MVideoFeed = Pick<MVideo, 'name' | 'uuid'>
+
+export type MVideoWithFile = MVideo &
+  PickWith<VideoModel, 'VideoFiles', MVideoFile[]>
+
+export type MVideoThumbnail = MVideo &
+  PickWith<VideoModel, 'Thumbnails', MThumbnail[]>
+export type MVideoIdThumbnail = MVideoThumbnail & MVideoId
+
+export type MVideoTag = MVideo &
+  PickWith<VideoModel, 'Tags', MTag[]>
+
+export type MVideoWithSchedule = MVideo &
+  PickWithOpt<VideoModel, 'ScheduleVideoUpdate', MScheduleVideoUpdate>
+
+export type MVideoWithFileThumbnail = MVideoWithFile & MVideoThumbnail
+
+export type MVideoUser = MVideo &
+  PickWith<VideoModel, 'VideoChannel', MChannelUserId>
+
+export type MVideoWithCaptions = MVideo &
+  PickWith<VideoModel, 'VideoCaptions', MVideoCaptionLanguage[]>
+
+export type MVideoWithBlacklistLight = MVideo &
+  PickWith<VideoModel, 'VideoBlacklist', MVideoBlacklistLight>
+
+export type MVideoAccountLight = MVideo &
+  PickWith<VideoModel, 'VideoChannel', MChannelAccountLight>
+
+export type MVideoWithRights = MVideoWithBlacklistLight & MVideoThumbnail & MVideoUser
+
+export type MVideoWithStreamingPlaylist = MVideo &
+  PickWith<VideoModel, 'VideoStreamingPlaylists', MStreamingPlaylist[]>
+
+export type MVideoWithAllFiles = MVideoWithFileThumbnail & MVideoWithStreamingPlaylist
+
+export type MVideoAccountAllFiles = MVideoWithAllFiles & MVideoAccountLight & MVideoWithBlacklistLight
+export type MVideoAccountAllFilesCaptions = MVideoAccountAllFiles & MVideoWithCaptions
+
+export type MVideoUserHistory = MVideo &
+  PickWith<VideoModel, 'UserVideoHistories', MUserVideoHistoryTime[]>
+
+export type MVideoWithBlacklistThumbnailScheduled = MVideoWithSchedule & MVideoWithBlacklistLight & MVideoWithFileThumbnail
+
+export type MVideoAccountDefault = MVideo &
+  PickWith<VideoModel, 'VideoChannel', MChannelActorAccountDefault>
+
+export type MVideoThumbnailAccountDefault = MVideoThumbnail &
+  PickWith<VideoModel, 'VideoChannel', MChannelActorAccountDefault>
+
+export type MVideoWithChannelActor = MVideo &
+  PickWith<VideoModel, 'VideoChannel', MChannelActor>
+
+export type MVideoFullLight = MVideoThumbnail &
+  MVideoWithBlacklistLight &
+  MVideoTag &
+  MVideoAccountLight &
+  MVideoUserHistory &
+  MVideoWithFile &
+  MVideoWithSchedule &
+  MVideoWithStreamingPlaylist &
+  MVideoUserHistory
+
+export type MVideoAP = MVideo &
+  MVideoTag &
+  MVideoAccountLight &
+  MVideoWithStreamingPlaylist &
+  MVideoWithCaptions &
+  PickWith<VideoModel, 'VideoBlacklist', MVideoBlacklistUnfederated> &
+  PickWith<VideoModel, 'VideoFiles', MVideoFileRedundanciesOpt[]>
+
+export type MVideoAPWithoutCaption = Omit<MVideoAP, 'VideoCaptions'>
+
+export type MVideoDetails = MVideo &
+  MVideoWithBlacklistLight &
+  MVideoTag &
+  MVideoAccountLight &
+  MVideoWithSchedule &
+  MVideoThumbnail &
+  MVideoUserHistory &
+  PickWith<VideoModel, 'VideoStreamingPlaylists', MStreamingPlaylistRedundancies[]> &
+  PickWith<VideoModel, 'VideoFiles', MVideoFileRedundanciesOpt[]>