Server: don't be rude when serving unknown video in watch html file

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

diff --git a/server/initializers/constants.js b/server/initializers/constants.js
index a50eb2f662fed5930ac6c089b488d48caa92d1c2..40e1c5381c9968e3215a630fdd5dd22ceb1f5c21 100644 (file)
--- a/server/initializers/constants.js
+++ b/server/initializers/constants.js
@@ -14,7 +14,7 @@ const PAGINATION_COUNT_DEFAULT = 15
 
 // Sortable columns per schema
 const SEARCHABLE_COLUMNS = {
-  VIDEOS: [ 'name', 'magnetUri', 'podUrl', 'author', 'tags' ]
+  VIDEOS: [ 'name', 'magnetUri', 'podHost', 'author', 'tags' ]
 }
 
 // Sortable columns per schema
@@ -55,6 +55,7 @@ const CONFIG = {
   }
 }
 CONFIG.WEBSERVER.URL = CONFIG.WEBSERVER.SCHEME + '://' + CONFIG.WEBSERVER.HOSTNAME + ':' + CONFIG.WEBSERVER.PORT
+CONFIG.WEBSERVER.HOST = CONFIG.WEBSERVER.HOSTNAME + ':' + CONFIG.WEBSERVER.PORT
 
 // ---------------------------------------------------------------------------
 
@@ -66,7 +67,9 @@ const CONSTRAINTS_FIELDS = {
   VIDEOS: {
     NAME: { min: 3, max: 50 }, // Length
     DESCRIPTION: { min: 3, max: 250 }, // Length
-    MAGNET_URI: { min: 10 }, // Length
+    MAGNET: {
+      INFO_HASH: { min: 10, max: 50 } // Length
+    },
     DURATION: { min: 1, max: 7200 }, // Number
     TAGS: { min: 1, max: 3 }, // Number of total tags
     TAG: { min: 2, max: 10 }, // Length
@@ -101,6 +104,22 @@ const MONGO_MIGRATION_SCRIPTS = [
   {
     script: '0020-requests-endpoint',
     version: 20
+  },
+  {
+    script: '0025-video-filenames',
+    version: 25
+  },
+  {
+    script: '0030-video-magnet',
+    version: 30
+  },
+  {
+    script: '0035-url-to-host',
+    version: 35
+  },
+  {
+    script: '0040-video-remote-id',
+    version: 40
   }
 ]
 const LAST_MONGO_SCHEMA_VERSION = (maxBy(MONGO_MIGRATION_SCRIPTS, 'version'))['version']
@@ -131,13 +150,18 @@ const REQUEST_ENDPOINTS = {
 
 // ---------------------------------------------------------------------------
 
+const REMOTE_SCHEME = {
+  HTTP: 'https',
+  WS: 'WS'
+}
+
 // Password encryption
 const BCRYPT_SALT_SIZE = 10
 
 // Express static paths (router)
 const STATIC_PATHS = {
-  PREVIEWS: '/static/previews',
-  THUMBNAILS: '/static/thumbnails',
+  PREVIEWS: '/static/previews/',
+  THUMBNAILS: '/static/thumbnails/',
   TORRENTS: '/static/torrents/',
   WEBSEED: '/static/webseed/'
 }
@@ -161,6 +185,8 @@ if (isTestInstance() === true) {
   CONSTRAINTS_FIELDS.VIDEOS.DURATION.max = 14
   FRIEND_SCORE.BASE = 20
   REQUESTS_INTERVAL = 10000
+  REMOTE_SCHEME.HTTP = 'http'
+  REMOTE_SCHEME.WS = 'ws'
   STATIC_MAX_AGE = 0
 }
 
@@ -177,12 +203,13 @@ module.exports = {
   OAUTH_LIFETIME,
   PAGINATION_COUNT_DEFAULT,
   PODS_SCORE,
+  PREVIEWS_SIZE,
+  REMOTE_SCHEME,
   REQUEST_ENDPOINTS,
   REQUESTS_IN_PARALLEL,
   REQUESTS_INTERVAL,
   REQUESTS_LIMIT,
   RETRY_REQUESTS,
-  PREVIEWS_SIZE,
   SEARCHABLE_COLUMNS,
   SORTABLE_COLUMNS,
   STATIC_MAX_AGE,