diff options
author | Gérald Niel <gerald.niel@gegeweb.org> | 2018-04-19 19:28:55 +0200 |
---|---|---|
committer | Gérald Niel <gerald.niel@gegeweb.org> | 2018-04-19 19:28:55 +0200 |
commit | 0db1a226507a39b0a663e3e63f04851836a44d5a (patch) | |
tree | 8c8dad658ea5608afaae238cfb6fe803292f908f /shared/models/videos | |
parent | 0030284b0df2983914291d6fe83675e2aa892e6a (diff) | |
parent | d4f3fea659163749f9ea879a5e1dd313106353c6 (diff) | |
download | PeerTube-0db1a226507a39b0a663e3e63f04851836a44d5a.tar.gz PeerTube-0db1a226507a39b0a663e3e63f04851836a44d5a.tar.zst PeerTube-0db1a226507a39b0a663e3e63f04851836a44d5a.zip |
Merge branch 'develop' of framagit.org:chocobozzz/PeerTube into develop
Diffstat (limited to 'shared/models/videos')
-rw-r--r-- | shared/models/videos/nsfw-policy.type.ts | 1 | ||||
-rw-r--r-- | shared/models/videos/video.model.ts | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/shared/models/videos/nsfw-policy.type.ts b/shared/models/videos/nsfw-policy.type.ts new file mode 100644 index 000000000..dc0032a14 --- /dev/null +++ b/shared/models/videos/nsfw-policy.type.ts | |||
@@ -0,0 +1 @@ | |||
export type NSFWPolicyType = 'do_not_list' | 'blur' | 'display' | |||
diff --git a/shared/models/videos/video.model.ts b/shared/models/videos/video.model.ts index 1b5f1a09c..70132c050 100644 --- a/shared/models/videos/video.model.ts +++ b/shared/models/videos/video.model.ts | |||
@@ -26,6 +26,7 @@ export interface Video { | |||
26 | category: VideoConstant<number> | 26 | category: VideoConstant<number> |
27 | licence: VideoConstant<number> | 27 | licence: VideoConstant<number> |
28 | language: VideoConstant<number> | 28 | language: VideoConstant<number> |
29 | privacy: VideoConstant<VideoPrivacy> | ||
29 | description: string | 30 | description: string |
30 | duration: number | 31 | duration: number |
31 | isLocal: boolean | 32 | isLocal: boolean |
@@ -48,7 +49,6 @@ export interface Video { | |||
48 | } | 49 | } |
49 | 50 | ||
50 | export interface VideoDetails extends Video { | 51 | export interface VideoDetails extends Video { |
51 | privacy: VideoConstant<VideoPrivacy> | ||
52 | descriptionPath: string | 52 | descriptionPath: string |
53 | support: string | 53 | support: string |
54 | channel: VideoChannel | 54 | channel: VideoChannel |