diff options
author | Chocobozzz <me@florianbigard.com> | 2020-11-16 13:49:09 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2020-11-16 13:57:14 +0100 |
commit | 19149d45b8f68569535f7188ef25e09e3d62c8b4 (patch) | |
tree | 92da0e0db2b0e277b2110a630f502433c86c9119 /server/types | |
parent | 8872828d59a5152e27734711ae30ebe86e84f570 (diff) | |
parent | f1273314593a4a7dc7ec9594ce0c6c3ae8f62b34 (diff) | |
download | PeerTube-19149d45b8f68569535f7188ef25e09e3d62c8b4.tar.gz PeerTube-19149d45b8f68569535f7188ef25e09e3d62c8b4.tar.zst PeerTube-19149d45b8f68569535f7188ef25e09e3d62c8b4.zip |
Merge branch 'feature/admin-comments' into develop
Diffstat (limited to 'server/types')
-rw-r--r-- | server/types/models/video/video-comment.ts | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/server/types/models/video/video-comment.ts b/server/types/models/video/video-comment.ts index f1c50c753..83479e7b2 100644 --- a/server/types/models/video/video-comment.ts +++ b/server/types/models/video/video-comment.ts | |||
@@ -1,7 +1,7 @@ | |||
1 | import { VideoCommentModel } from '../../../models/video/video-comment' | ||
2 | import { PickWith, PickWithOpt } from '@shared/core-utils' | 1 | import { PickWith, PickWithOpt } from '@shared/core-utils' |
2 | import { VideoCommentModel } from '../../../models/video/video-comment' | ||
3 | import { MAccountDefault, MAccountFormattable, MAccountUrl } from '../account' | 3 | import { MAccountDefault, MAccountFormattable, MAccountUrl } from '../account' |
4 | import { MVideoAccountLight, MVideoFeed, MVideoIdUrl, MVideoUrl } from './video' | 4 | import { MVideo, MVideoAccountLight, MVideoFeed, MVideoIdUrl, MVideoUrl } from './video' |
5 | 5 | ||
6 | type Use<K extends keyof VideoCommentModel, M> = PickWith<VideoCommentModel, K, M> | 6 | type Use<K extends keyof VideoCommentModel, M> = PickWith<VideoCommentModel, K, M> |
7 | 7 | ||
@@ -59,6 +59,11 @@ export type MCommentFormattable = | |||
59 | MCommentTotalReplies & | 59 | MCommentTotalReplies & |
60 | Use<'Account', MAccountFormattable> | 60 | Use<'Account', MAccountFormattable> |
61 | 61 | ||
62 | export type MCommentAdminFormattable = | ||
63 | MComment & | ||
64 | Use<'Account', MAccountFormattable> & | ||
65 | Use<'Video', MVideo> | ||
66 | |||
62 | export type MCommentAP = | 67 | export type MCommentAP = |
63 | MComment & | 68 | MComment & |
64 | Use<'Account', MAccountUrl> & | 69 | Use<'Account', MAccountUrl> & |