e19e91044d
refs #8221, closes #7688, refs #7558 🙇 Improve meta data publisher logo behaviour This is a follow-up PR for #8285. Reasons: The code changes of #8285 caused error messages when falling back to the default `favicon.ico`, as the `image-size` tool doesn't support `ico` files. This PR takes the logic to decide which logo needs to be listed in our schema into a new fn `blog_logo.js`. There we have now three decisions: 1. If we have a publication **logo**, we'll take that one 2. If we have no publication logo, but an **icon** we'll use this one. 3. If we have none of the above things, we fall back to our default `favicon.ico` Additional, we're hard coding image dimensions for whenever the logo is an `.ico` file and built and extra decision to not call `image-size` when the dimension are already given. I will create another follow-up PR, which checks the extension type for the file and offers it as a util. 🛠 Blog icon util refs #7688 Serve functionality around the blog icon in its own util: - getIconDimensions -> async function that takes the filepath of on ico file and returns its dimensions - isIcoImageType -> returns true if file has `.ico` extension - getIconType -> returns icon-type (`x-icon` or `png`) - getIconUrl -> returns the absolut or relativ URL for the favicon: `[subdirectory or not]favicon.[ico or png]` 📖 Get .ico sizes for meta data & logo improvement refs #7558 refs #8221 Use the new `blogIconUtil` in meta data to fetch the dimensions of `.ico` files. Improvements for `publisher.logo`: We're now returning a hard-coded 'faked' image dimensions value to render an `imageObject` and prevent error our schema (Google structured data). As soon as an image (`.ico` or non-`.ico`) is too large, but - in case of non-`.ico` - a square format, be set the image-dimensions to 60px width and height. This reduces the chances of getting constantly error messages from Googles' webmaster tools. - add getIconPath util
50 lines
1.4 KiB
JavaScript
50 lines
1.4 KiB
JavaScript
var config = require('../../config'),
|
|
blogIconUtils = require('../../utils/blog-icon'),
|
|
utils = require('../../utils');
|
|
|
|
/**
|
|
* Serve either uploaded favicon or default
|
|
* @return {string}
|
|
*/
|
|
function getFaviconUrl() {
|
|
return blogIconUtils.getIconUrl();
|
|
}
|
|
|
|
function getAssetUrl(path, hasMinFile) {
|
|
// CASE: favicon - this is special path with its own functionality
|
|
if (path.match(/\/?favicon\.(ico|png)$/)) {
|
|
// @TODO, resolve this - we should only be resolving subdirectory and extension.
|
|
return getFaviconUrl();
|
|
}
|
|
|
|
// CASE: Build the output URL
|
|
// Add subdirectory...
|
|
var output = utils.url.urlJoin(utils.url.getSubdir(), '/');
|
|
|
|
// Optionally add /assets/
|
|
if (!path.match(/^public/) && !path.match(/^asset/)) {
|
|
output = utils.url.urlJoin(output, 'assets/');
|
|
}
|
|
|
|
// replace ".foo" with ".min.foo" if configured
|
|
if (hasMinFile && config.get('useMinFiles') !== false) {
|
|
path = path.replace(/\.([^\.]*)$/, '.min.$1');
|
|
}
|
|
|
|
// Add the path for the requested asset
|
|
output = utils.url.urlJoin(output, path);
|
|
|
|
// Ensure we have an assetHash
|
|
// @TODO rework this!
|
|
if (!config.get('assetHash')) {
|
|
config.set('assetHash', utils.generateAssetHash());
|
|
}
|
|
|
|
// Finally add the asset hash to the output URL
|
|
output += '?v=' + config.get('assetHash');
|
|
|
|
return output;
|
|
}
|
|
|
|
module.exports = getAssetUrl;
|