Merge branch 'develop' of github.com:Chocobozzz/PeerTube into develop

[github/Chocobozzz/PeerTube.git] / server / initializers / constants.ts

diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts
index 5946bcd11ce53b54477d54f78e79e3728f51aafa..481b21bbb2e3ffaa1b0c8697671b018fa7808ba3 100644 (file)
--- a/server/initializers/constants.ts
+++ b/server/initializers/constants.ts
@@ -106,6 +106,7 @@ const CONFIG = {
     USERNAME: config.get<string>('smtp.username'),
     PASSWORD: config.get<string>('smtp.password'),
     TLS: config.get<boolean>('smtp.tls'),
+    DISABLE_STARTTLS: config.get<boolean>('smtp.disable_starttls'),
     CA_FILE: config.get<string>('smtp.ca_file'),
     FROM_ADDRESS: config.get<string>('smtp.from_address')
   },
@@ -157,6 +158,7 @@ const CONFIG = {
   },
   INSTANCE: {
     get NAME () { return config.get<string>('instance.name') },
+    get SHORT_DESCRIPTION () { return config.get<string>('instance.short_description') },
     get DESCRIPTION () { return config.get<string>('instance.description') },
     get TERMS () { return config.get<string>('instance.terms') },
     get DEFAULT_CLIENT_ROUTE () { return config.get<string>('instance.default_client_route') },
@@ -224,7 +226,7 @@ const CONSTRAINTS_FIELDS = {
     COUNT: { min: 0 }
   },
   VIDEO_COMMENTS: {
-    TEXT: { min: 2, max: 3000 }, // Length
+    TEXT: { min: 1, max: 3000 }, // Length
     URL: { min: 3, max: 2000 } // Length
   },
   VIDEO_SHARE: {
@@ -233,7 +235,10 @@ const CONSTRAINTS_FIELDS = {
 }
 
 let VIDEO_VIEW_LIFETIME = 60000 * 60 // 1 hour
-const MAX_VIDEO_TRANSCODING_FPS = 30
+const VIDEO_TRANSCODING_FPS = {
+  MIN: 10,
+  MAX: 30
+}
 
 const VIDEO_RATE_TYPES: { [ id: string ]: VideoRateType } = {
   LIKE: 'like',
@@ -444,7 +449,7 @@ export {
   VIDEO_LICENCES,
   VIDEO_RATE_TYPES,
   VIDEO_MIMETYPE_EXT,
-  MAX_VIDEO_TRANSCODING_FPS,
+  VIDEO_TRANSCODING_FPS,
   USER_PASSWORD_RESET_LIFETIME,
   IMAGE_MIMETYPE_EXT,
   SCHEDULER_INTERVAL,