mirror of
https://github.com/TryGhost/Ghost.git
synced 2025-02-03 23:00:14 -05:00
fixes https://github.com/TryGhost/Team/issues/1652 fixes https://github.com/TryGhost/Ghost/issues/13319 **Image formatting** Added support for changing the format of images via the `handle-image-sizes` middleware (e.g. format SVG to png, jpeg, webp) This change was required: - Not all browsers support SVG favicons, so we need to convert them to PNGs - We can't fit image resizing and formatting in the `serve-favicon` middleware: we need to store the resized image to avoid resizing on every request. This system was already present in the `handle-image-sizes` middleware. To format an uploaded image: - Original URL: https://localhost/blog/content/images/2022/05/giphy.gif - To resize: https://localhost/blog/content/images/size/w256h256/2022/05/giphy.gif (already supported) - To resize and format to webp: https://localhost/blog/content/images/size/w256h256/format/webp/2022/05/giphy.gif - Animations are preserved when converting Gifs to Webp and in reverse, and also when only resizing (https://github.com/TryGhost/Ghost/issues/13319) **Favicons** - Custom favicons are no longer served via `/favicon.png` or `/favicon.ico` (only for default favicon), but use their full path - Added support for uploading more image extensions in Ghost as a favicon: .jpg, .jpeg, .gif, .webp and .svg are now supported (already supported .png and .ico). - File extensions other than jpg/jpeg, png, or ico will always get transformed to the image/png format to guarantee browser support (webp and svg images are not yet supported as favicons by all browsers). For all image formats, other than .ico files: - Allowed to upload images larger than 1000px in width and height, they will get cropped to 256x256px. - Allowed uploading favicons that are not square. They will get cropped automatically. - Allowed to upload larger files, up to 20MB (will get served at a lower file size after being resized) For .svg files: - The minimum size of 60x60px is no longer required. For .ico files: - The file size limit is increased to 200kb (coming from 100kb)
149 lines
5.1 KiB
JavaScript
149 lines
5.1 KiB
JavaScript
const sizeOf = require('image-size');
|
|
const Promise = require('bluebird');
|
|
const _ = require('lodash');
|
|
const path = require('path');
|
|
const errors = require('@tryghost/errors');
|
|
const tpl = require('@tryghost/tpl');
|
|
|
|
const messages = {
|
|
error: 'Could not fetch icon dimensions.'
|
|
};
|
|
|
|
class BlogIcon {
|
|
constructor({config, urlUtils, settingsCache, storageUtils}) {
|
|
this.config = config;
|
|
this.urlUtils = urlUtils;
|
|
this.settingsCache = settingsCache;
|
|
this.storageUtils = storageUtils;
|
|
}
|
|
|
|
/**
|
|
* Get dimensions for ico file from its real file storage path
|
|
* Always returns {object} getIconDimensions
|
|
* @param {string} path
|
|
* @returns {Promise<Object>} getIconDimensions
|
|
* @description Takes a file path and returns ico width and height.
|
|
*/
|
|
getIconDimensions(storagePath) {
|
|
return new Promise((resolve, reject) => {
|
|
let dimensions;
|
|
|
|
try {
|
|
dimensions = sizeOf(storagePath);
|
|
|
|
if (dimensions.images) {
|
|
dimensions.width = _.maxBy(dimensions.images, function (w) {
|
|
return w.width;
|
|
}).width;
|
|
dimensions.height = _.maxBy(dimensions.images, function (h) {
|
|
return h.height;
|
|
}).height;
|
|
}
|
|
|
|
return resolve({
|
|
width: dimensions.width,
|
|
height: dimensions.height
|
|
});
|
|
} catch (err) {
|
|
return reject(new errors.ValidationError({
|
|
message: tpl(messages.error, {
|
|
file: storagePath,
|
|
error: err.message
|
|
})
|
|
}));
|
|
}
|
|
});
|
|
}
|
|
|
|
/**
|
|
* Returns the mime type (part after image/) of the favicon that will get served (not the stored one)
|
|
* @param {string} [icon]
|
|
* @returns {'png' | 'x-icon' | 'jpeg'}
|
|
* @description Takes a path and returns boolean value.
|
|
*/
|
|
getIconType(icon) {
|
|
const ext = this.getIconExt(icon);
|
|
|
|
return ext === 'ico' ? 'x-icon' : ext;
|
|
}
|
|
|
|
/**
|
|
* We support the usage of .svg, .gif, .webp extensions, but (for now, until more browser support them) transform them to
|
|
* a simular extension
|
|
* @param {string} [icon]
|
|
* @returns {'png' | 'ico' | 'jpeg'}
|
|
*/
|
|
getIconExt(icon) {
|
|
const blogIcon = icon || this.settingsCache.get('icon');
|
|
|
|
// If the native format is supported, return the native format
|
|
if (blogIcon.match(/.ico$/i)) {
|
|
return 'ico';
|
|
}
|
|
|
|
if (blogIcon.match(/.jpe?g$/i)) {
|
|
return 'jpeg';
|
|
}
|
|
|
|
if (blogIcon.match(/.png$/i)) {
|
|
return 'png';
|
|
}
|
|
|
|
// Default to png for all other types
|
|
return 'png';
|
|
}
|
|
|
|
getSourceIconExt(icon) {
|
|
const blogIcon = icon || this.settingsCache.get('icon');
|
|
return path.extname(blogIcon).toLowerCase().substring(1);
|
|
}
|
|
|
|
/**
|
|
* Return URL for Blog icon: [subdirectory or not]favicon.[ico, jpeg, or png]
|
|
* Always returns {string} getIconUrl
|
|
* @returns {string} [subdirectory or not]favicon.[ico, jpeg, or png]
|
|
* @description Checks if we have a custom uploaded icon and the extension of it. If no custom uploaded icon
|
|
* exists, we're returning the default `favicon.ico`
|
|
*/
|
|
getIconUrl(absolute) {
|
|
const blogIcon = this.settingsCache.get('icon');
|
|
|
|
if (blogIcon) {
|
|
// Resize + format icon to one of the supported file extensions
|
|
const sourceExt = this.getSourceIconExt(blogIcon);
|
|
const destintationExt = this.getIconExt(blogIcon);
|
|
|
|
if (sourceExt === 'ico') {
|
|
// Resize not supported (prevent a redirect)
|
|
return this.urlUtils.urlFor({relativeUrl: blogIcon}, absolute ? true : undefined);
|
|
}
|
|
|
|
if (sourceExt !== destintationExt) {
|
|
const formattedIcon = blogIcon.replace(/\/content\/images\//, `/content/images/size/w256h256/format/${this.getIconExt(blogIcon)}/`);
|
|
return this.urlUtils.urlFor({relativeUrl: formattedIcon}, absolute ? true : undefined);
|
|
}
|
|
|
|
const sizedIcon = blogIcon.replace(/\/content\/images\//, '/content/images/size/w256h256/');
|
|
return this.urlUtils.urlFor({relativeUrl: sizedIcon}, absolute ? true : undefined);
|
|
} else {
|
|
return this.urlUtils.urlFor({relativeUrl: '/favicon.ico'}, absolute ? true : undefined);
|
|
}
|
|
}
|
|
|
|
/**
|
|
* @description Checks if we have a custom uploaded icon. If no custom uploaded icon
|
|
* exists, we're returning the default `favicon.ico`
|
|
* @returns {string} physical storage path of site icon without [subdirectory]/content/image prefix
|
|
*/
|
|
getIconPath() {
|
|
const blogIcon = this.settingsCache.get('icon');
|
|
|
|
if (blogIcon) {
|
|
return this.storageUtils.getLocalImagesStoragePath(blogIcon);
|
|
} else {
|
|
return path.join(this.config.get('paths:publicFilePath'), 'favicon.ico');
|
|
}
|
|
}
|
|
}
|
|
|
|
module.exports = BlogIcon;
|