From fc8c024a1b1b1e439ef8f5b34513033920852b82 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 11 Jun 2019 10:39:30 +0200 Subject: [PATCH] Fix upload script --- server/tools/peertube-upload.ts | 3 +-- shared/extra-utils/videos/videos.ts | 5 ++++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/server/tools/peertube-upload.ts b/server/tools/peertube-upload.ts index 687f2e60b..bfce10e54 100644 --- a/server/tools/peertube-upload.ts +++ b/server/tools/peertube-upload.ts @@ -77,7 +77,7 @@ async function run (url: string, username: string, password: string) { licence: program['licence'] || undefined, language: program['language'] || undefined, nsfw: program['nsfw'] !== undefined ? program['nsfw'] : false, - description: program['videoDescription'] || '', + description: program['videoDescription'] || undefined, tags: program['tags'] || [], commentsEnabled: program['commentsEnabled'] !== undefined ? program['commentsEnabled'] : true, downloadEnabled: program['downloadEnabled'] !== undefined ? program['downloadEnabled'] : true, @@ -94,7 +94,6 @@ async function run (url: string, username: string, password: string) { console.log(`Video ${program['videoName']} uploaded.`) process.exit(0) } catch (err) { - console.log('coucou') console.error(require('util').inspect(err)) process.exit(-1) } diff --git a/shared/extra-utils/videos/videos.ts b/shared/extra-utils/videos/videos.ts index debaaf9a7..c78563232 100644 --- a/shared/extra-utils/videos/videos.ts +++ b/shared/extra-utils/videos/videos.ts @@ -355,7 +355,6 @@ async function uploadVideo (url: string, accessToken: string, videoAttributesArg .set('Accept', 'application/json') .set('Authorization', 'Bearer ' + accessToken) .field('name', attributes.name) - .field('support', attributes.support) .field('nsfw', JSON.stringify(attributes.nsfw)) .field('commentsEnabled', JSON.stringify(attributes.commentsEnabled)) .field('downloadEnabled', JSON.stringify(attributes.downloadEnabled)) @@ -363,6 +362,10 @@ async function uploadVideo (url: string, accessToken: string, videoAttributesArg .field('privacy', attributes.privacy.toString()) .field('channelId', attributes.channelId) + if (attributes.support !== undefined) { + req.field('support', attributes.support) + } + if (attributes.description !== undefined) { req.field('description', attributes.description) }