Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-03-04 03:21:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #6442

Browse Source
This commit is contained in:
Julian Lam
2018-04-11 15:02:48 -04:00
parent 8fcf57dfad
commit 90a99fe158
2 changed files with 14 additions and 2 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);
}

4
src/meta/tags.js
View File

@@ -136,8 +136,8 @@ Tags.parse = function (req, data, meta, link, callback) {
}
addIfNotExists(meta, 'property', 'og:image', ogImage);
if (ogImage) {
addIfNotExists(meta, 'property', 'og:image:width', 200);
addIfNotExists(meta, 'property', 'og:image:height', 200);
addIfNotExists(meta, 'property', 'og:image:width', Meta.config['og:image:width'] || 200);
addIfNotExists(meta, 'property', 'og:image:height', Meta.config['og:image:height'] || 200);
}
link = results.links.links.concat(link || []);