Merge branch 'release/4.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 9c3dcd6d3c123db468cae09e8fedc70ae16e4f8f..3b6d0597ce037a3736882d983700975b79f36abc 100644 (file)
--- a/shared/models/server/server-config.model.ts
+++ b/shared/models/server/server-config.model.ts
@@ -1,13 +1,14 @@
 import { VideoPrivacy } from '../videos/video-privacy.enum'
-import { ClientScript } from '../plugins/plugin-package-json.model'
+import { ClientScriptJSON } from '../plugins/plugin-package-json.model'
 import { NSFWPolicyType } from '../videos/nsfw-policy.type'
 import { BroadcastMessageLevel } from './broadcast-message-level.type'
 
 export interface ServerConfigPlugin {
   name: string
+  npmName: string
   version: string
   description: string
-  clientScripts: { [name: string]: ClientScript }
+  clientScripts: { [name: string]: ClientScriptJSON }
 }
 
 export interface ServerConfigTheme extends ServerConfigPlugin {
@@ -37,8 +38,12 @@ export interface ServerConfig {
   client: {
     videos: {
       miniature: {
+        displayAuthorAvatar: boolean
         preferAuthorDisplayName: boolean
       }
+      resumableUpload: {
+        maxChunkSize: number
+      }
     }
 
     menu: {
@@ -55,6 +60,16 @@ export interface ServerConfig {
       privacy: VideoPrivacy
       licence: number
     }
+
+    p2p: {
+      webapp: {
+        enabled: boolean
+      }
+
+      embed: {
+        enabled: boolean
+      }
+    }
   }
 
   webadmin: {
@@ -137,10 +152,14 @@ export interface ServerConfig {
   live: {
     enabled: boolean
 
+    allowReplay: boolean
+    latencySetting: {
+      enabled: boolean
+    }
+
     maxDuration: number
     maxInstanceLives: number
     maxUserLives: number
-    allowReplay: boolean
 
     transcoding: {
       enabled: boolean
@@ -156,6 +175,10 @@ export interface ServerConfig {
     }
   }
 
+  videoStudio: {
+    enabled: boolean
+  }
+
   import: {
     videos: {
       http: {
@@ -165,6 +188,9 @@ export interface ServerConfig {
         enabled: boolean
       }
     }
+    videoChannelSynchronization: {
+      enabled: boolean
+    }
   }
 
   autoBlacklist: {