aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/typings/models
diff options
context:
space:
mode:
authorRigel Kent <sendmemail@rigelk.eu>2020-04-17 10:47:22 +0200
committerRigel Kent <par@rigelk.eu>2020-05-01 16:41:02 +0200
commit86521a67b2edb06a139b095e489c205457eaba8f (patch)
tree3a0106ab146c3d8436ce502a43d38838800c4595 /server/typings/models
parent9b4241e33bf46c4f0468565ce41ca7f810b2dbfa (diff)
downloadPeerTube-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')
-rw-r--r--server/typings/models/video/video-abuse.ts9
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 @@
1import { VideoAbuseModel } from '../../../models/video/video-abuse' 1import { VideoAbuseModel } from '../../../models/video/video-abuse'
2import { PickWith } from '../../utils' 2import { PickWith } from '../../utils'
3import { MVideo } from './video' 3import { MVideoAccountLightBlacklistAllFiles } from './video'
4import { MAccountDefault, MAccountFormattable } from '../account' 4import { MAccountDefault, MAccountFormattable } from '../account'
5 5
6type Use<K extends keyof VideoAbuseModel, M> = PickWith<VideoAbuseModel, K, M> 6type Use<K extends keyof VideoAbuseModel, M> = PickWith<VideoAbuseModel, K, M>
@@ -16,12 +16,12 @@ export type MVideoAbuseId = Pick<VideoAbuseModel, 'id'>
16export type MVideoAbuseVideo = 16export type MVideoAbuseVideo =
17 MVideoAbuse & 17 MVideoAbuse &
18 Pick<VideoAbuseModel, 'toActivityPubObject'> & 18 Pick<VideoAbuseModel, 'toActivityPubObject'> &
19 Use<'Video', MVideo> 19 Use<'Video', MVideoAccountLightBlacklistAllFiles>
20 20
21export type MVideoAbuseAccountVideo = 21export 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 =
31export type MVideoAbuseFormattable = 31export 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'>>