Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-08-31 05:16:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse Source
This commit is contained in:
Julian Lam
2018-04-11 16:30:03 -04:00
parent 2e6e7f7484 90a99fe158
commit 7ba2ac9f69
81 changed files with 494 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/controllers/admin/uploads.js
View File

@@ -5,6 +5,7 @@ var async = require('async');
var nconf = require('nconf');
var mime = require('mime');
var fs = require('fs');
var jimp = require('jimp');
var meta = require('../../meta');
var file = require('../../file');
@@ -273,6 +274,17 @@ function uploadImage(filename, folder, uploadedFile, req, res, next) {
], function (err) {
next(err, imageData);
});
} else if (path.basename(filename, path.extname(filename)) === 'og:image' && folder === 'system') {
jimp.read(imageData.path).then(function (image) {
meta.configs.setMultiple({
'og:image:height': image.bitmap.height,
'og:image:width': image.bitmap.width,
}, function (err) {
next(err, imageData);
});
}).catch(function (err) {
next(err);
});
} else {
setImmediate(next, null, imageData);
}