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

2 files changed, 7 insertions, 3 deletions

diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts
index 705d9b520..481b21bbb 100644
--- a/server/initializers/constants.ts
+++ b/server/initializers/constants.ts
@@ -226,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: {
diff --git a/server/tools/import-videos.ts b/server/tools/import-videos.ts
index 433cee652..baaedd329 100644
--- a/server/tools/import-videos.ts
+++ b/server/tools/import-videos.ts
@@ -53,7 +53,10 @@ async function run () {
 
   const options = [ '-j', '--flat-playlist', '--playlist-reverse' ]
   youtubeDL.getInfo(program['targetUrl'], options, processOptions, async (err, info) => {
-    if (err) throw err
+    if (err) {
+      console.log(err.message)
+      process.exit(1)
+    }
 
     let infoArray: any[]
 
@@ -157,7 +160,8 @@ async function uploadVideoOnPeerTube (videoInfo: any, videoPath: string, languag
 
       await uploadVideo(program['url'], accessToken, videoAttributes)
     } else {
-      throw err
+      console.log(err.message)
+      process.exit(1)
     }
   }