Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-26 16:46:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

chore: remove deprecated v2 style responses for thumbs upload route [breaking]

Browse Source
This commit is contained in:
Julian Lam
2021-01-27 16:07:36 -05:00
parent 2ad0d0d0d8
commit 84dfdfe659
1 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/controllers/uploads.js
View File

@@ -23,12 +23,9 @@ uploadsController.upload = async function (req, res, filesIterator) {
return helpers.formatApiResponse(400, res); return helpers.formatApiResponse(400, res);
} }
// TODO: Remove this (and the usages of isV2 below) in v1.17.0
const isV2 = req.originalUrl === `${nconf.get('relative_path')}/api/v2/util/upload`;
// These checks added because of odd behaviour by request: https://github.com/request/request/issues/2445 // These checks added because of odd behaviour by request: https://github.com/request/request/issues/2445
if (!Array.isArray(files)) { if (!Array.isArray(files)) {
return isV2 ? res.status(500).json('invalid files') : helpers.formatApiResponse(500, res, new Error('[[error:invalid-file]]')); return helpers.formatApiResponse(500, res, new Error('[[error:invalid-file]]'));
} }
if (Array.isArray(files[0])) { if (Array.isArray(files[0])) {
files = files[0]; files = files[0];
@@ -41,19 +38,11 @@ uploadsController.upload = async function (req, res, filesIterator) {
images.push(await filesIterator(fileObj)); images.push(await filesIterator(fileObj));
} }
if (isV2) {
res.status(200).json(images);
} else {
helpers.formatApiResponse(200, res, { images }); helpers.formatApiResponse(200, res, { images });
}
return images; return images;
} catch (err) { } catch (err) {
if (isV2) {
res.status(500).json({ path: req.path, error: err.message });
} else {
return helpers.formatApiResponse(500, res, err); return helpers.formatApiResponse(500, res, err);
}
} finally { } finally {
deleteTempFiles(files); deleteTempFiles(files);
} }