Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-03-11 02:12:21 -05:00
Code Issues Activity

Removed bluebird from frontend/meta (#14940)

Browse source 
refs: https://github.com/TryGhost/Ghost/issues/14882

- Usage of bluebird is deprecated in favour of using native promises

Co-authored-by: Navarjun <navarjun@Navarjuns-MBP.hitronhub.home>
This commit is contained in:
Navarjun 2022-08-24 07:28:35 -07:00 • committed by GitHub
parent e986b78458
commit 57a786c63c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 50 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ghost/core/core/frontend/meta/get-meta.js
View file

@ -1,4 +1,3 @@
const Promise = require('bluebird');
const settingsCache = require('../../shared/settings-cache');
const urlUtils = require('../../shared/url-utils');
const logging = require('@tryghost/logging');
@ -81,7 +80,7 @@ function getMetaData(data, root) {
}
// @TODO: wrap this in a utility function
return Promise.props(getImageDimensions(metaData)).then(function () {
return getImageDimensions(metaData).then(function () {
metaData.structuredData = getStructuredData(metaData);
metaData.schema = getSchema(metaData, data);

90
ghost/core/core/frontend/meta/image-dimensions.js
View file

@ -1,15 +1,14 @@
const Promise = require('bluebird');
const _ = require('lodash');
const imageSizeCache = require('../../server/lib/image').cachedImageSizeFromUrl;
/**
* Get Image dimensions
* @param {object} metaData
* @returns {object} metaData
* @returns {Promise<object>} metaData
* @description for image properties in meta data (coverImage, authorImage and site.logo), `getCachedImageSizeFromUrl` is
* called to receive image width and height
*/
function getImageDimensions(metaData) {
async function getImageDimensions(metaData) {
const fetch = {
coverImage: imageSizeCache.getCachedImageSizeFromUrl(metaData.coverImage.url),
authorImage: imageSizeCache.getCachedImageSizeFromUrl(metaData.authorImage.url),
@ -17,45 +16,54 @@ function getImageDimensions(metaData) {
logo: imageSizeCache.getCachedImageSizeFromUrl(metaData.site.logo.url)
};
return Promise
.props(fetch)
.then(function (imageObj) {
_.forEach(imageObj, function (key, value) {
if (_.has(key, 'width') && _.has(key, 'height')) {
// We have some restrictions for publisher.logo:
// The image needs to be <=600px wide and <=60px high (ideally exactly 600px x 60px).
// Unless we have proper image-handling (see https://github.com/TryGhost/Ghost/issues/4453),
// we will fake it in some cases or not produce an imageObject at all.
if (value === 'logo') {
if (key.height <= 60 && key.width <= 600) {
_.assign(metaData.site[value], {
dimensions: {
width: key.width,
height: key.height
}
});
} else if (key.width === key.height) {
// CASE: the logo is too large, but it is a square. We fake it...
_.assign(metaData.site[value], {
dimensions: {
width: 60,
height: 60
}
});
}
} else {
_.assign(metaData[value], {
dimensions: {
width: key.width,
height: key.height
}
});
}
}
});
const [coverImage, authorImage, ogImage, logo] = await Promise.all([
fetch.coverImage,
fetch.authorImage,
fetch.ogImage,
fetch.logo
]);
const imageObj = {
coverImage,
authorImage,
ogImage,
logo
};
return metaData;
});
_.forEach(imageObj, function (key, value) {
if (_.has(key, 'width') && _.has(key, 'height')) {
// We have some restrictions for publisher.logo:
// The image needs to be <=600px wide and <=60px high (ideally exactly 600px x 60px).
// Unless we have proper image-handling (see https://github.com/TryGhost/Ghost/issues/4453),
// we will fake it in some cases or not produce an imageObject at all.
if (value === 'logo') {
if (key.height <= 60 && key.width <= 600) {
_.assign(metaData.site[value], {
dimensions: {
width: key.width,
height: key.height
}
});
} else if (key.width === key.height) {
// CASE: the logo is too large, but it is a square. We fake it...
_.assign(metaData.site[value], {
dimensions: {
width: 60,
height: 60
}
});
}
} else {
_.assign(metaData[value], {
dimensions: {
width: key.width,
height: key.height
}
});
}
}
});
return metaData;
}
module.exports = getImageDimensions;