cuts staging from master #944

Merged
jessopb merged 6 commits from master into staging 2019-03-01 06:47:25 +01:00
Showing only changes of commit 42fc707dba - Show all commits

View file

@ -23,7 +23,7 @@ const updateMetadata = ({ nsfw, license, licenseUrl, title, description }) => {
const update = {};
if (nsfw) update['nsfw'] = nsfw;
if (license) update['license'] = license;
if (licenseUrl) update['license_url'] = licenseUrl;
if (licenseUrl) update['licenseUrl'] = licenseUrl;
if (title) update['title'] = title;
if (description) update['description'] = description;
return update;
@ -81,7 +81,15 @@ const claimUpdate = ({ body, files, headers, ip, originalUrl, user, tor }, res)
gaStartTime = Date.now();
try {
({ name, nsfw, license, title, description, thumbnail } = parsePublishApiRequestBody(body));
({
name,
nsfw,
license,
licenseUrl,
title,
description,
thumbnail,
} = parsePublishApiRequestBody(body));
({
fileName,
filePath,