diff options
author | Rigel Kent <sendmemail@rigelk.eu> | 2020-04-17 10:47:22 +0200 |
---|---|---|
committer | Rigel Kent <par@rigelk.eu> | 2020-05-01 16:41:02 +0200 |
commit | 86521a67b2edb06a139b095e489c205457eaba8f (patch) | |
tree | 3a0106ab146c3d8436ce502a43d38838800c4595 /server/typings/models/video | |
parent | 9b4241e33bf46c4f0468565ce41ca7f810b2dbfa (diff) | |
download | PeerTube-86521a67b2edb06a139b095e489c205457eaba8f.tar.gz PeerTube-86521a67b2edb06a139b095e489c205457eaba8f.tar.zst PeerTube-86521a67b2edb06a139b095e489c205457eaba8f.zip |
Add video channel and video thumbnail, rework video appearance in row
Diffstat (limited to 'server/typings/models/video')
-rw-r--r-- | server/typings/models/video/video-abuse.ts | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/server/typings/models/video/video-abuse.ts b/server/typings/models/video/video-abuse.ts index 49bd1ff2e..54acccdf5 100644 --- a/server/typings/models/video/video-abuse.ts +++ b/server/typings/models/video/video-abuse.ts | |||
@@ -1,6 +1,6 @@ | |||
1 | import { VideoAbuseModel } from '../../../models/video/video-abuse' | 1 | import { VideoAbuseModel } from '../../../models/video/video-abuse' |
2 | import { PickWith } from '../../utils' | 2 | import { PickWith } from '../../utils' |
3 | import { MVideo } from './video' | 3 | import { MVideoAccountLightBlacklistAllFiles } from './video' |
4 | import { MAccountDefault, MAccountFormattable } from '../account' | 4 | import { MAccountDefault, MAccountFormattable } from '../account' |
5 | 5 | ||
6 | type Use<K extends keyof VideoAbuseModel, M> = PickWith<VideoAbuseModel, K, M> | 6 | type Use<K extends keyof VideoAbuseModel, M> = PickWith<VideoAbuseModel, K, M> |
@@ -16,12 +16,12 @@ export type MVideoAbuseId = Pick<VideoAbuseModel, 'id'> | |||
16 | export type MVideoAbuseVideo = | 16 | export type MVideoAbuseVideo = |
17 | MVideoAbuse & | 17 | MVideoAbuse & |
18 | Pick<VideoAbuseModel, 'toActivityPubObject'> & | 18 | Pick<VideoAbuseModel, 'toActivityPubObject'> & |
19 | Use<'Video', MVideo> | 19 | Use<'Video', MVideoAccountLightBlacklistAllFiles> |
20 | 20 | ||
21 | export type MVideoAbuseAccountVideo = | 21 | export type MVideoAbuseAccountVideo = |
22 | MVideoAbuse & | 22 | MVideoAbuse & |
23 | Pick<VideoAbuseModel, 'toActivityPubObject'> & | 23 | Pick<VideoAbuseModel, 'toActivityPubObject'> & |
24 | Use<'Video', MVideo> & | 24 | Use<'Video', MVideoAccountLightBlacklistAllFiles> & |
25 | Use<'Account', MAccountDefault> | 25 | Use<'Account', MAccountDefault> |
26 | 26 | ||
27 | // ############################################################################ | 27 | // ############################################################################ |
@@ -31,4 +31,5 @@ export type MVideoAbuseAccountVideo = | |||
31 | export type MVideoAbuseFormattable = | 31 | export type MVideoAbuseFormattable = |
32 | MVideoAbuse & | 32 | MVideoAbuse & |
33 | Use<'Account', MAccountFormattable> & | 33 | Use<'Account', MAccountFormattable> & |
34 | Use<'Video', Pick<MVideo, 'id' | 'uuid' | 'name' | 'nsfw'>> | 34 | Use<'Video', Pick<MVideoAccountLightBlacklistAllFiles, |
35 | 'id' | 'uuid' | 'name' | 'nsfw' | 'getMiniatureStaticPath' | 'isBlacklisted' | 'VideoChannel'>> | ||