Merge branch 'develop' of framagit.org:chocobozzz/PeerTube into develop

6 files changed, 13 insertions, 3 deletions

diff --git a/shared/models/server/custom-config.model.ts b/shared/models/server/custom-config.model.ts
index b4d24cfbe..30956bd47 100644
--- a/shared/models/server/custom-config.model.ts
+++ b/shared/models/server/custom-config.model.ts
@@ -1,3 +1,5 @@
+import { NSFWPolicyType } from '../videos/nsfw-policy.type'
+
 export interface CustomConfig {
   instance: {
     name: string
@@ -5,6 +7,7 @@ export interface CustomConfig {
     description: string
     terms: string
     defaultClientRoute: string
+    defaultNSFWPolicy: NSFWPolicyType
     customizations: {
       javascript?: string
       css?: string
diff --git a/shared/models/server/server-config.model.ts b/shared/models/server/server-config.model.ts
index 611d0efe5..d1f956163 100644
--- a/shared/models/server/server-config.model.ts
+++ b/shared/models/server/server-config.model.ts
@@ -1,3 +1,5 @@
+import { NSFWPolicyType } from '../videos/nsfw-policy.type'
+
 export interface ServerConfig {
   serverVersion: string
 
@@ -5,6 +7,7 @@ export interface ServerConfig {
     name: string
     shortDescription: string
     defaultClientRoute: string
+    defaultNSFWPolicy: NSFWPolicyType
     customizations: {
       javascript: string
       css: string
diff --git a/shared/models/users/user-update-me.model.ts b/shared/models/users/user-update-me.model.ts
index b84233329..0a73879ed 100644
--- a/shared/models/users/user-update-me.model.ts
+++ b/shared/models/users/user-update-me.model.ts
@@ -1,6 +1,8 @@
+import { NSFWPolicyType } from '../videos/nsfw-policy.type'
+
 export interface UserUpdateMe {
   description?: string
-  displayNSFW?: boolean
+  nsfwPolicy?: NSFWPolicyType
   autoPlayVideo?: boolean
   email?: string
   password?: string
diff --git a/shared/models/users/user.model.ts b/shared/models/users/user.model.ts
index b5f459f31..188e29ede 100644
--- a/shared/models/users/user.model.ts
+++ b/shared/models/users/user.model.ts
@@ -1,12 +1,13 @@
 import { Account } from '../actors'
 import { VideoChannel } from '../videos/video-channel.model'
 import { UserRole } from './user-role'
+import { NSFWPolicyType } from '../videos/nsfw-policy.type'
 
 export interface User {
   id: number
   username: string
   email: string
-  displayNSFW: boolean
+  nsfwPolicy: NSFWPolicyType
   autoPlayVideo: boolean
   role: UserRole
   videoQuota: number
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 {
   category: VideoConstant<number>
   licence: VideoConstant<number>
   language: VideoConstant<number>
+  privacy: VideoConstant<VideoPrivacy>
   description: string
   duration: number
   isLocal: boolean
@@ -48,7 +49,6 @@ export interface Video {
 }
 
 export interface VideoDetails extends Video {
-  privacy: VideoConstant<VideoPrivacy>
   descriptionPath: string
   support: string
   channel: VideoChannel