diff options
author | Rigel Kent <sendmemail@rigelk.eu> | 2020-06-28 22:45:25 +0200 |
---|---|---|
committer | Rigel Kent <sendmemail@rigelk.eu> | 2020-06-28 22:45:27 +0200 |
commit | b8b3abac6ac25ab4a8a2bf7e5016d6df173bae19 (patch) | |
tree | a737927ea38d6f7914a238266ba6a3ee4cb8a3c1 | |
parent | 4ee63ec6487a1e5bc35f539c80364fb3c06b522b (diff) | |
download | PeerTube-b8b3abac6ac25ab4a8a2bf7e5016d6df173bae19.tar.gz PeerTube-b8b3abac6ac25ab4a8a2bf7e5016d6df173bae19.tar.zst PeerTube-b8b3abac6ac25ab4a8a2bf7e5016d6df173bae19.zip |
fix change ownership typing
-rw-r--r-- | server/types/models/video/video-change-ownership.ts | 4 | ||||
-rw-r--r-- | 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 @@ | |||
1 | import { VideoChangeOwnershipModel } from '@server/models/video/video-change-ownership' | 1 | import { VideoChangeOwnershipModel } from '@server/models/video/video-change-ownership' |
2 | import { PickWith } from '@shared/core-utils' | 2 | import { PickWith } from '@shared/core-utils' |
3 | import { MAccountDefault, MAccountFormattable } from '../account/account' | 3 | import { MAccountDefault, MAccountFormattable } from '../account/account' |
4 | import { MVideo, MVideoWithAllFiles } from './video' | 4 | import { MVideoWithAllFiles, MVideoFormattable } from './video' |
5 | 5 | ||
6 | type Use<K extends keyof VideoChangeOwnershipModel, M> = PickWith<VideoChangeOwnershipModel, K, M> | 6 | type 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 @@ | |||
1 | import { Account } from '../actors' | 1 | import { Account } from '../actors' |
2 | import { Video } from './video.model' | ||
2 | 3 | ||
3 | export interface VideoChangeOwnership { | 4 | export 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 | ||