Merge branch 'master' into develop

[oweals/peertube.git] / shared / models / server / custom-config.model.ts

diff --git a/shared/models/server/custom-config.model.ts b/shared/models/server/custom-config.model.ts
index 028aafa1a3f3309af82553d45d7d91c837216915..ca52eff4ba761b48cd43510ab89424004b3ae99d 100644 (file)
--- a/shared/models/server/custom-config.model.ts
+++ b/shared/models/server/custom-config.model.ts
@@ -6,6 +6,7 @@ export interface CustomConfig {
     shortDescription: string
     description: string
     terms: string
+    isNSFW: boolean
     defaultClientRoute: string
     defaultNSFWPolicy: NSFWPolicyType
     customizations: {
@@ -41,6 +42,10 @@ export interface CustomConfig {
     email: string
   }
 
+  contactForm: {
+    enabled: boolean
+  }
+
   user: {
     videoQuota: number
     videoQuotaDaily: number
@@ -57,6 +62,9 @@ export interface CustomConfig {
       '720p': boolean
       '1080p': boolean
     }
+    hls: {
+      enabled: boolean
+    }
   }
 
   import: {
@@ -69,4 +77,20 @@ export interface CustomConfig {
       }
     }
   }
+
+  autoBlacklist: {
+    videos: {
+      ofUsers: {
+        enabled: boolean
+      }
+    }
+  }
+
+  followers: {
+    instance: {
+      enabled: boolean,
+      manualApproval: boolean
+    }
+  }
+
 }