Cleanup model types

1 files changed, 11 insertions, 3 deletions

diff --git a/server/typings/models/video/video-abuse.ts b/server/typings/models/video/video-abuse.ts
index 1667ae55a..0474cac5b 100644
--- a/server/typings/models/video/video-abuse.ts
+++ b/server/typings/models/video/video-abuse.ts
@@ -3,13 +3,21 @@ import { PickWith } from '../../utils'
 import { MVideo } from './video'
 import { MAccountDefault } from '../account'
 
+type Use<K extends keyof VideoAbuseModel, M> = PickWith<VideoAbuseModel, K, M>
+
+// ############################################################################
+
 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>
+  Use<'Video', MVideo>
 
-export type MVideoAbuseAccountVideo = MVideoAbuseVideo &
-  PickWith<VideoAbuseModel, 'Account', MAccountDefault>
+export type MVideoAbuseAccountVideo = MVideoAbuse &
+  Pick<VideoAbuseModel, 'toActivityPubObject'> &
+  Use<'Video', MVideo> &
+  Use<'Account', MAccountDefault>