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

fix: changes to thumb resizing logic

Browse Source 
- Resized thumb no longer skews aspect ratio
- Thumbs resized down to maximum thumb size by WIDTH only
- image.checkDimensions() now returns dimensions
This commit is contained in:
Julian Lam
2020-12-08 09:48:32 -05:00
parent 37c367d6ff
commit 67cf5e83b7
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/controllers/uploads.js
View File

@@ -120,12 +120,14 @@ uploadsController.uploadThumb = async function (req, res) {
throw new Error('[[error:invalid-file]]'); throw new Error('[[error:invalid-file]]');
} }
await image.isFileTypeAllowed(uploadedFile.path); await image.isFileTypeAllowed(uploadedFile.path);
await image.checkDimensions(uploadedFile.path); const dimensions = await image.checkDimensions(uploadedFile.path);
await image.resizeImage({
path: uploadedFile.path, if (dimensions.width > parseInt(meta.config.topicThumbSize, 10)) {
width: meta.config.topicThumbSize, await image.resizeImage({
height: meta.config.topicThumbSize, path: uploadedFile.path,
}); width: meta.config.topicThumbSize,
});
}
if (plugins.hooks.hasListeners('filter:uploadImage')) { if (plugins.hooks.hasListeners('filter:uploadImage')) {
return await plugins.hooks.fire('filter:uploadImage', { return await plugins.hooks.fire('filter:uploadImage', {
image: uploadedFile, image: uploadedFile,

2
src/image.js
View File

@@ -105,6 +105,8 @@ image.checkDimensions = async function (path) {
if (result.width > meta.config.rejectImageWidth || result.height > meta.config.rejectImageHeight) { if (result.width > meta.config.rejectImageWidth || result.height > meta.config.rejectImageHeight) {
throw new Error('[[error:invalid-image-dimensions]]'); throw new Error('[[error:invalid-image-dimensions]]');
} }
return result;
}; };
image.convertImageToBase64 = async function (path) { image.convertImageToBase64 = async function (path) {