aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorRigel Kent <sendmemail@rigelk.eu>2020-06-28 22:45:25 +0200
committerRigel Kent <sendmemail@rigelk.eu>2020-06-28 22:45:27 +0200
commitb8b3abac6ac25ab4a8a2bf7e5016d6df173bae19 (patch)
treea737927ea38d6f7914a238266ba6a3ee4cb8a3c1
parent4ee63ec6487a1e5bc35f539c80364fb3c06b522b (diff)
downloadPeerTube-b8b3abac6ac25ab4a8a2bf7e5016d6df173bae19.tar.gz
PeerTube-b8b3abac6ac25ab4a8a2bf7e5016d6df173bae19.tar.zst
PeerTube-b8b3abac6ac25ab4a8a2bf7e5016d6df173bae19.zip
fix change ownership typing
-rw-r--r--server/types/models/video/video-change-ownership.ts4
-rw-r--r--shared/models/videos/video-change-ownership.model.ts8
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 @@
1import { VideoChangeOwnershipModel } from '@server/models/video/video-change-ownership' 1import { VideoChangeOwnershipModel } from '@server/models/video/video-change-ownership'
2import { PickWith } from '@shared/core-utils' 2import { PickWith } from '@shared/core-utils'
3import { MAccountDefault, MAccountFormattable } from '../account/account' 3import { MAccountDefault, MAccountFormattable } from '../account/account'
4import { MVideo, MVideoWithAllFiles } from './video' 4import { MVideoWithAllFiles, MVideoFormattable } from './video'
5 5
6type Use<K extends keyof VideoChangeOwnershipModel, M> = PickWith<VideoChangeOwnershipModel, K, M> 6type Use<K extends keyof VideoChangeOwnershipModel, M> = PickWith<VideoChangeOwnershipModel, K, M>
7 7
@@ -23,4 +23,4 @@ export type MVideoChangeOwnershipFormattable =
23 Pick<MVideoChangeOwnership, 'id' | 'status' | 'createdAt'> & 23 Pick<MVideoChangeOwnership, 'id' | 'status' | 'createdAt'> &
24 Use<'Initiator', MAccountFormattable> & 24 Use<'Initiator', MAccountFormattable> &
25 Use<'NextOwner', MAccountFormattable> & 25 Use<'NextOwner', MAccountFormattable> &
26 Use<'Video', Pick<MVideo, 'id' | 'uuid' | 'url' | 'name'>> 26 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 @@
1import { Account } from '../actors' 1import { Account } from '../actors'
2import { Video } from './video.model'
2 3
3export interface VideoChangeOwnership { 4export interface VideoChangeOwnership {
4 id: number 5 id: number
5 status: VideoChangeOwnershipStatus 6 status: VideoChangeOwnershipStatus
6 initiatorAccount: Account 7 initiatorAccount: Account
7 nextOwnerAccount: Account 8 nextOwnerAccount: Account
8 video: { 9 video: Video
9 id: number
10 name: string
11 uuid: string
12 url: string
13 }
14 createdAt: Date 10 createdAt: Date
15} 11}
16 12