aboutsummaryrefslogtreecommitdiffhomepage
path: root/shared/models/videos
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2017-12-11 11:06:32 +0100
committerChocobozzz <florian.bigard@gmail.com>2017-12-11 11:06:32 +0100
commitfada8d75550dc7365f7e18ee1569b9406251d660 (patch)
treedb9dc01c18693824f83fce5020f4c1f3ae7c0865 /shared/models/videos
parent492fd28167f770d79a430fc57451b5a9e075d8e7 (diff)
parentc2830fa8f84f61462098bf36add824f89436dfa9 (diff)
downloadPeerTube-fada8d75550dc7365f7e18ee1569b9406251d660.tar.gz
PeerTube-fada8d75550dc7365f7e18ee1569b9406251d660.tar.zst
PeerTube-fada8d75550dc7365f7e18ee1569b9406251d660.zip
Merge branch 'feature/design' into develop
Diffstat (limited to 'shared/models/videos')
-rw-r--r--shared/models/videos/video-create.model.ts10
-rw-r--r--shared/models/videos/video.model.ts4
2 files changed, 8 insertions, 6 deletions
diff --git a/shared/models/videos/video-create.model.ts b/shared/models/videos/video-create.model.ts
index e537c38a8..8bc6a6639 100644
--- a/shared/models/videos/video-create.model.ts
+++ b/shared/models/videos/video-create.model.ts
@@ -1,13 +1,13 @@
1import { VideoPrivacy } from './video-privacy.enum' 1import { VideoPrivacy } from './video-privacy.enum'
2 2
3export interface VideoCreate { 3export interface VideoCreate {
4 category: number 4 category?: number
5 licence: number 5 licence?: number
6 language: number 6 language?: number
7 description: string 7 description?: string
8 channelId: number 8 channelId: number
9 nsfw: boolean 9 nsfw: boolean
10 name: string 10 name: string
11 tags: string[] 11 tags?: string[]
12 privacy: VideoPrivacy 12 privacy: VideoPrivacy
13} 13}
diff --git a/shared/models/videos/video.model.ts b/shared/models/videos/video.model.ts
index 08b29425c..dc12a05d9 100644
--- a/shared/models/videos/video.model.ts
+++ b/shared/models/videos/video.model.ts
@@ -1,3 +1,4 @@
1import { Account } from '../accounts'
1import { VideoChannel } from './video-channel.model' 2import { VideoChannel } from './video-channel.model'
2import { VideoPrivacy } from './video-privacy.enum' 3import { VideoPrivacy } from './video-privacy.enum'
3 4
@@ -13,7 +14,7 @@ export interface VideoFile {
13export interface Video { 14export interface Video {
14 id: number 15 id: number
15 uuid: string 16 uuid: string
16 account: string 17 accountName: string
17 createdAt: Date | string 18 createdAt: Date | string
18 updatedAt: Date | string 19 updatedAt: Date | string
19 categoryLabel: string 20 categoryLabel: string
@@ -43,4 +44,5 @@ export interface VideoDetails extends Video {
43 descriptionPath: string 44 descriptionPath: string
44 channel: VideoChannel 45 channel: VideoChannel
45 files: VideoFile[] 46 files: VideoFile[]
47 account: Account
46} 48}