Merge branch 'release/v1.3.0' into develop

[github/Chocobozzz/PeerTube.git] / shared / models / server / server-config.model.ts

diff --git a/shared/models/server/server-config.model.ts b/shared/models/server/server-config.model.ts
index baafed31faf8a7a6329399e9cc8b56f02d5d0091..d937e9c05a2d39b1c8039697cde01c022bcfc350 100644 (file)
--- a/shared/models/server/server-config.model.ts
+++ b/shared/models/server/server-config.model.ts
@@ -8,6 +8,7 @@ export interface ServerConfig {
     name: string
     shortDescription: string
     defaultClientRoute: string
+    isNSFW: boolean
     defaultNSFWPolicy: NSFWPolicyType
     customizations: {
       javascript: string
@@ -48,6 +49,14 @@ export interface ServerConfig {
     }
   }
 
+  autoBlacklist: {
+    videos: {
+      ofUsers: {
+        enabled: boolean
+      }
+    }
+  }
+
   avatar: {
     file: {
       size: {
@@ -88,4 +97,8 @@ export interface ServerConfig {
       intervalDays: number
     }
   }
+
+  tracker: {
+    enabled: boolean
+  }
 }