From b8b3abac6ac25ab4a8a2bf7e5016d6df173bae19 Mon Sep 17 00:00:00 2001
From: Rigel Kent <sendmemail@rigelk.eu>
Date: Sun, 28 Jun 2020 22:45:25 +0200
Subject: [PATCH] fix change ownership typing

---
 server/types/models/video/video-change-ownership.ts  | 4 ++--
 shared/models/videos/video-change-ownership.model.ts | 8 ++------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/server/types/models/video/video-change-ownership.ts b/server/types/models/video/video-change-ownership.ts
index 244d1a671..6cad48e4a 100644
--- a/server/types/models/video/video-change-ownership.ts
+++ b/server/types/models/video/video-change-ownership.ts
@@ -1,7 +1,7 @@
 import { VideoChangeOwnershipModel } from '@server/models/video/video-change-ownership'
 import { PickWith } from '@shared/core-utils'
 import { MAccountDefault, MAccountFormattable } from '../account/account'
-import { MVideo, MVideoWithAllFiles } from './video'
+import { MVideoWithAllFiles, MVideoFormattable } from './video'
 
 type Use<K extends keyof VideoChangeOwnershipModel, M> = PickWith<VideoChangeOwnershipModel, K, M>
 
@@ -23,4 +23,4 @@ export type MVideoChangeOwnershipFormattable =
   Pick<MVideoChangeOwnership, 'id' | 'status' | 'createdAt'> &
   Use<'Initiator', MAccountFormattable> &
   Use<'NextOwner', MAccountFormattable> &
-  Use<'Video', Pick<MVideo, 'id' | 'uuid' | 'url' | 'name'>>
+  Use<'Video', MVideoFormattable>
diff --git a/shared/models/videos/video-change-ownership.model.ts b/shared/models/videos/video-change-ownership.model.ts
index 0d735c798..a9b1a17f3 100644
--- a/shared/models/videos/video-change-ownership.model.ts
+++ b/shared/models/videos/video-change-ownership.model.ts
@@ -1,16 +1,12 @@
 import { Account } from '../actors'
+import { Video } from './video.model'
 
 export interface VideoChangeOwnership {
   id: number
   status: VideoChangeOwnershipStatus
   initiatorAccount: Account
   nextOwnerAccount: Account
-  video: {
-    id: number
-    name: string
-    uuid: string
-    url: string
-  }
+  video: Video
   createdAt: Date
 }