ghost 4.22.3 → 4.25.0

package/core/frontend/apps/amp/lib/helpers/amp_content.js

@@ -143,7 +143,7 @@ function getAmperizeHTML(html, post) {
                 if (err) {
                     if (err.src) {
                         // This is a valid 500 GhostError because it means the amperize parser is unable to handle some Ghost HTML.
-                        logging.error(new errors.GhostError({
+                        logging.error(new errors.InternalServerError({
                             message: `AMP HTML couldn't be parsed: ${err.src}`,
                             code: 'AMP_PARSER_ERROR',
                             err: err,
@@ -151,7 +151,7 @@ function getAmperizeHTML(html, post) {
                             help: 'Please share this error on GitHub or https://forum.ghost.org'
                         }));
                     } else {
-                        logging.error(new errors.GhostError({err, code: 'AMP_PARSER_ERROR'}));
+                        logging.error(new errors.InternalServerError({err, code: 'AMP_PARSER_ERROR'}));
                     }
 
                     // save it in cache to prevent multiple calls to Amperize until

package/core/frontend/apps/amp/lib/views/amp.hbs

@@ -457,6 +457,118 @@
         margin: 0 .5em;
     }
 
+    .kg-toggle-card-icon {
+        display: none;
+    }
+
+    .kg-toggle-content {
+        margin-top: 0.8rem;
+    }
+
+    .kg-nft-card-container {
+        position: relative;
+        display: flex;
+        flex: auto;
+        flex-direction: column;
+        text-decoration: none;
+        font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Oxygen,Ubuntu,Cantarell,Open Sans,Helvetica Neue,sans-serif;
+        font-size: 1.4rem;
+        font-weight: 400;
+        box-shadow: 0 2px 6px -2px rgb(0 0 0 / 10%), 0 0 1px rgb(0 0 0 / 40%);
+        width: 100%;
+        max-width: 512px;
+        color: #15212A;
+        background: #fff;
+        border-radius: 5px;
+        transition: none;
+        margin: 0 auto; 
+    }
+
+    .kg-nft-metadata {
+        padding: 2.0rem;
+    }
+
+    .kg-nft-image-container {
+        position: relative;
+    }
+
+    .kg-nft-image {
+        display: flex;
+        border-radius: 5px 5px 0 0;
+    }
+
+    .kg-nft-header {
+        display: flex;
+        justify-content: space-between;
+        align-items: flex-start;
+        gap: 20px;
+    }
+
+    .kg-nft-header h4.kg-nft-title {
+        font-size: 1.9rem;
+        font-weight: 700;
+        margin: 0;
+        color: #15212A;
+    }
+
+    .kg-nft-header amp-img {
+        max-width: 114px;
+        max-height: 26px;
+    }
+
+    .kg-nft-opensea-logo {
+        margin-top: 2px;
+        width: 100px;
+    }
+
+    .kg-nft-creator {
+        font-family: inherit;
+        color: #95A1AD;
+    }
+
+    .kg-nft-creator span {
+        font-weight: 500;
+        color: #15212A;
+    }
+
+    .kg-nft-card p.kg-nft-description {
+        font-size: 1.4rem;
+        line-height: 1.4em;
+        margin: 2.0rem 0 0;
+        color: #222;
+    }
+
+    .kg-button-card {
+        display: flex;
+        position: static;
+        align-items: center;
+        width: 100%;
+        justify-content: center;
+    }
+
+    .kg-btn {
+        display: flex;
+        position: static;
+        align-items: center;
+        padding: 0 2.0rem;
+        height: 4.0rem;
+        line-height: 4.0rem;
+        font-size: 1.65rem;
+        font-weight: 600;
+        text-decoration: none;
+        border-radius: 5px;
+        transition: opacity 0.2s ease-in-out;
+    }
+
+    .kg-btn:hover {
+        opacity: 0.85;
+    }
+
+    .kg-btn-accent {
+        background-color: var(--ghost-accent-color, #1292EE);
+        color: #fff;
+    }
+
     .kg-width-full.kg-card-hascaption {
         display: grid;
         grid-template-columns: inherit;

package/core/frontend/apps/private-blogging/index.js

@@ -24,7 +24,7 @@ let checkSubdir = function checkSubdir() {
         paths = urlUtils.getSubdir().split('/');
 
         if (paths.pop() === PRIVATE_KEYWORD) {
-            logging.error(new errors.GhostError({
+            logging.error(new errors.InternalServerError({
                 message: tpl(messages.urlCannotContainPrivateSubdir.error),
                 context: tpl(messages.urlCannotContainPrivateSubdir.description),
                 help: tpl(messages.urlCannotContainPrivateSubdir.help)

package/core/frontend/apps/private-blogging/lib/router.js

@@ -36,7 +36,7 @@ privateRouter
     .post(
         bodyParser.urlencoded({extended: true}),
         middleware.redirectPrivateToHomeIfLoggedIn,
-        web.shared.middlewares.brute.privateBlog,
+        web.shared.middleware.brute.privateBlog,
         middleware.doLoginToPrivateSite,
         _renderer
     );

package/core/frontend/services/apps/index.js

@@ -18,7 +18,7 @@ module.exports = {
 
         return Promise.map(appsToLoad, appName => loader.activateAppByName(appName))
             .catch(function (err) {
-                logging.error(new errors.GhostError({
+                logging.error(new errors.InternalServerError({
                     err: err,
                     context: tpl(messages.appWillNotBeLoadedError),
                     help: tpl(messages.appWillNotBeLoadedHelp)

package/core/frontend/services/apps/loader.js

@@ -40,9 +40,9 @@ module.exports = {
 
         // Check for an activate() method on the app.
         if (!_.isFunction(app.activate)) {
-            return Promise.reject(new errors.IncorrectUsageError(
-                tpl(messages.noActivateMethodLoadingAppError, {name: name})
-            ));
+            return Promise.reject(new errors.IncorrectUsageError({
+                message: tpl(messages.noActivateMethodLoadingAppError, {name: name})
+            }));
         }
 
         // Wrapping the activate() with a when because it's possible

package/core/frontend/services/card-assets/index.js

@@ -1,16 +1,4 @@
-const debug = require('@tryghost/debug')('card-assets');
-const themeEngine = require('../theme-engine');
-
 const CardAssetService = require('./service');
 let cardAssetService = new CardAssetService();
 
-const initFn = async () => {
-    const cardAssetConfig = themeEngine.getActive().config('card_assets');
-    debug('initialising with config', cardAssetConfig);
-
-    await cardAssetService.load(cardAssetConfig);
-};
-
 module.exports = cardAssetService;
-
-module.exports.init = initFn;

package/core/frontend/services/card-assets/service.js

@@ -1,14 +1,15 @@
+const debug = require('@tryghost/debug')('card-assets');
 const Minifier = require('@tryghost/minifier');
 const _ = require('lodash');
 const path = require('path');
 const fs = require('fs').promises;
 const logging = require('@tryghost/logging');
+const config = require('../../../shared/config');
 
 class CardAssetService {
     constructor(options = {}) {
-        // @TODO: use our config paths concept
-        this.src = options.src || path.join(__dirname, '../../src/cards');
-        this.dest = options.dest || path.join(__dirname, '../../public');
+        this.src = options.src || path.join(config.get('paths').assetSrc, 'cards');
+        this.dest = options.dest || config.getContentPath('public');
         this.minifier = new Minifier({src: this.src, dest: this.dest});
 
         if ('config' in options) {
@@ -52,35 +53,31 @@ class CardAssetService {
     async minify(globs) {
         try {
             return await this.minifier.minify(globs);
-        } catch (err) {
-            // @TODO: Convert this back to a proper error once the underlying bug is fixed
-            if (err.code === 'EACCES') {
-                logging.warn('Ghost was not able to write card asset files due to permissions.');
+        } catch (error) {
+            if (error.code === 'EACCES') {
+                logging.error('Ghost was not able to write card asset files due to permissions.');
+                return;
             }
+
+            throw error;
         }
     }
 
     async clearFiles() {
         this.files = [];
 
-        // @deprecated switch this to use fs.rm when we drop support for Node v12
-        try {
-            await fs.unlink(path.join(this.dest, 'cards.min.css'));
-        } catch (error) {
-            // Don't worry if the file didn't exist or we don't have perms here
-            if (error.code !== 'ENOENT' && error.code !== 'EACCES') {
-                throw error;
-            }
-        }
+        const rmFile = async (name) => {
+            await fs.unlink(path.join(this.dest, name));
+        };
 
-        try {
-            await fs.unlink(path.join(this.dest, 'cards.min.js'));
-        } catch (error) {
-            // Don't worry if the file didn't exist or we don't have perms here
-            if (error.code !== 'ENOENT' && error.code !== 'EACCES') {
-                throw error;
-            }
-        }
+        let promises = [
+            // @deprecated switch this to use fs.rm when we drop support for Node v12
+            rmFile('cards.min.css'),
+            rmFile('cards.min.js')
+        ];
+
+        // We don't care if removing these files fails as it's valid for them to not exist
+        return Promise.allSettled(promises);
     }
 
     hasFile(type) {
@@ -90,18 +87,22 @@ class CardAssetService {
     /**
      * A theme can declare which cards it supports, and we'll do the rest
      *
-     * @param {Array|boolean} config
+     * @param {Array|boolean} cardAssetConfig
      * @returns
      */
-    async load(config) {
-        if (config) {
-            this.config = config;
+    async load(cardAssetConfig) {
+        if (cardAssetConfig) {
+            this.config = cardAssetConfig;
         }
 
+        debug('loading with config', cardAssetConfig);
+
         await this.clearFiles();
 
         const globs = this.generateGlobs();
 
+        debug('globs', globs);
+
         this.files = await this.minify(globs) || [];
     }
 }

package/core/frontend/services/helpers/handlebars.js

@@ -17,7 +17,7 @@ function asyncHelperWrapper(hbsInstance, name, fn) {
         Promise.resolve(fn.call(this, context, options)).then(function asyncHelperSuccess(result) {
             cb(result);
         }).catch(function asyncHelperError(err) {
-            const wrappedErr = err instanceof errors.GhostError ? err : new errors.IncorrectUsageError({
+            const wrappedErr = errors.utils.isGhostError(err) ? err : new errors.IncorrectUsageError({
                 err: err,
                 context: 'registerAsyncThemeHelper: ' + name,
                 errorDetails: {

package/core/frontend/services/routing/CollectionRouter.js

@@ -3,7 +3,7 @@ const urlUtils = require('../../../shared/url-utils');
 const ParentRouter = require('./ParentRouter');
 
 const controllers = require('./controllers');
-const middlewares = require('./middlewares');
+const middleware = require('./middleware');
 const RSSRouter = require('./RSSRouter');
 
 /**
@@ -27,7 +27,6 @@ class CollectionRouter extends ParentRouter {
         this.rss = object.rss !== false;
 
         this.permalinks = {
-            originalValue: object.permalink,
             value: object.permalink
         };
 
@@ -71,7 +70,7 @@ class CollectionRouter extends ParentRouter {
         this.mountRoute(this.route.value, controllers.collection);
 
         // REGISTER: enable pagination by default
-        this.router().param('page', middlewares.pageParam);
+        this.router().param('page', middleware.pageParam);
         this.mountRoute(urlUtils.urlJoin(this.route.value, 'page', ':page(\\d+)'), controllers.collection);
 
         // REGISTER: is rss enabled?
@@ -93,7 +92,7 @@ class CollectionRouter extends ParentRouter {
     }
 
     /**
-     * @description Prepare index context for further middlewares/controllers.
+     * @description Prepare index context for further middleware/controllers.
      */
     _prepareEntriesContext(req, res, next) {
         res.routerOptions = {
@@ -116,7 +115,7 @@ class CollectionRouter extends ParentRouter {
     }
 
     /**
-     * @description Prepare entry context for further middlewares/controllers.
+     * @description Prepare entry context for further middleware/controllers.
      */
     _prepareEntryContext(req, res, next) {
         res.routerOptions.context = ['post'];

package/core/frontend/services/routing/EmailRouter.js

@@ -30,7 +30,7 @@ class EmailRouter extends ParentRouter {
     }
 
     /**
-     * @description Prepare context for further middlewares/controllers.
+     * @description Prepare context for further middleware/controllers.
      * @param {Object} req
      * @param {Object} res
      * @param {Function} next

package/core/frontend/services/routing/ParentRouter.js

@@ -180,14 +180,6 @@ class ParentRouter {
         return this.permalinks;
     }
 
-    /**
-     * @description Get configured filter of this router.
-     * @returns {String}
-     */
-    getFilter() {
-        return this.filter;
-    }
-
     /**
      * @description Get main route of this router.
      *

package/core/frontend/services/routing/PreviewRouter.js

@@ -30,7 +30,7 @@ class PreviewRouter extends ParentRouter {
     }
 
     /**
-     * @description Prepare context for further middlewares/controllers.
+     * @description Prepare context for further middleware/controllers.
      * @param {Object} req
      * @param {Object} res
      * @param {Function} next

package/core/frontend/services/routing/StaticPagesRouter.js

@@ -52,7 +52,7 @@ class StaticPagesRouter extends ParentRouter {
     }
 
     /**
-     * @description Prepare context for futher middlewares/controllers.
+     * @description Prepare context for futher middleware/controllers.
      * @param {Object} req
      * @param {Object} res
      * @param {Function} next

package/core/frontend/services/routing/StaticRoutesRouter.js

@@ -3,7 +3,7 @@ const errors = require('@tryghost/errors');
 const urlUtils = require('../../../shared/url-utils');
 const RSSRouter = require('./RSSRouter');
 const controllers = require('./controllers');
-const middlewares = require('./middlewares');
+const middleware = require('./middleware');
 const ParentRouter = require('./ParentRouter');
 
 /**
@@ -59,14 +59,14 @@ class StaticRoutesRouter extends ParentRouter {
         this.mountRoute(this.route.value, controllers[this.controller]);
 
         // REGISTER: pagination
-        this.router().param('page', middlewares.pageParam);
+        this.router().param('page', middleware.pageParam);
         this.mountRoute(urlUtils.urlJoin(this.route.value, 'page', ':page(\\d+)'), controllers[this.controller]);
 
         this.routerCreated(this);
     }
 
     /**
-     * @description Prepare channel context for further middlewares/controllers.
+     * @description Prepare channel context for further middleware/controllers.
      * @param {Object} req
      * @param {Object} res
      * @param {Function} next
@@ -102,7 +102,7 @@ class StaticRoutesRouter extends ParentRouter {
     }
 
     /**
-     * @description Prepare static route context for further middlewares/controllers.
+     * @description Prepare static route context for further middleware/controllers.
      * @param {Object} req
      * @param {Object} res
      * @param {Function} next

package/core/frontend/services/routing/TaxonomyRouter.js

@@ -4,7 +4,7 @@ const ParentRouter = require('./ParentRouter');
 const RSSRouter = require('./RSSRouter');
 const urlUtils = require('../../../shared/url-utils');
 const controllers = require('./controllers');
-const middlewares = require('./middlewares');
+const middleware = require('./middleware');
 
 /**
  * @description Taxonomies are groupings of posts based on a common relation.
@@ -51,7 +51,7 @@ class TaxonomyRouter extends ParentRouter {
         this.mountRoute(this.permalinks.getValue(), controllers.channel);
 
         // REGISTER: enable pagination for each taxonomy by default
-        this.router().param('page', middlewares.pageParam);
+        this.router().param('page', middleware.pageParam);
         this.mountRoute(urlUtils.urlJoin(this.permalinks.value, 'page', ':page(\\d+)'), controllers.channel);
 
         // REGISTER: edit redirect to admin client e.g. /tag/:slug/edit
@@ -63,7 +63,7 @@ class TaxonomyRouter extends ParentRouter {
     }
 
     /**
-     * @description Prepare context for routing middlewares/controllers.
+     * @description Prepare context for routing middleware/controllers.
      * @param {Object} req
      * @param {Object} res
      * @param {Function} next

package/core/frontend/services/routing/router-manager.js

@@ -43,7 +43,12 @@ class RouterManager {
             return;
         }
 
-        this.urlService.onRouterAddedType(router);
+        this.urlService.onRouterAddedType(
+            router.identifier,
+            router.filter,
+            router.getResourceType(),
+            router.getPermalinks().getValue()
+        );
     }
 
     /**
@@ -179,7 +184,7 @@ class RouterManager {
         if (collectionRouter.getPermalinks().getValue().match(/:year|:month|:day/)) {
             debug('handleTimezoneEdit: trigger regeneration');
 
-            this.urlService.onRouterUpdated(collectionRouter);
+            this.urlService.onRouterUpdated(collectionRouter.identifier);
         }
     }
 }

package/core/frontend/services/rss/generate-feed.js

@@ -1,6 +1,5 @@
 const downsize = require('downsize');
 const Promise = require('bluebird');
-const cheerio = require('cheerio');
 const RSS = require('rss');
 const urlUtils = require('../../../shared/url-utils');
 const {routerManager} = require('../routing');
@@ -19,6 +18,8 @@ const generateTags = function generateTags(data) {
 };
 
 const generateItem = function generateItem(post, secure) {
+    const cheerio = require('cheerio');
+
     const itemUrl = routerManager.getUrlByResourceId(post.id, {secure, absolute: true});
     const htmlContent = cheerio.load(post.html || '');
     const item = {

package/core/frontend/services/theme-engine/middleware/ensure-active-theme.js

@@ -0,0 +1,34 @@
+const errors = require('@tryghost/errors');
+const tpl = require('@tryghost/tpl');
+
+const activeTheme = require('../active');
+const settingsCache = require('../../../../shared/settings-cache');
+
+const messages = {
+    missingTheme: 'The currently active theme "{theme}" is missing.'
+};
+
+// ### Ensure Active Theme
+// Ensure there's a properly set & mounted active theme before attempting to serve a site request
+// If there is no active theme, throw an error
+// Else, ensure the active theme is mounted
+function ensureActiveTheme(req, res, next) {
+    // CASE: this means that the theme hasn't been loaded yet i.e. there is no active theme
+    if (!activeTheme.get()) {
+        // This is the one place we ACTUALLY throw an error for a missing theme as it's a request we cannot serve
+        return next(new errors.InternalServerError({
+            // We use the settingsCache here, because the setting will be set,
+            // even if the theme itself is not usable because it is invalid or missing.
+            message: tpl(messages.missingTheme, {theme: settingsCache.get('active_theme')})
+        }));
+    }
+
+    // If the active theme has not yet been mounted, mount it into express
+    if (!activeTheme.get().mounted) {
+        activeTheme.get().mount(req.app);
+    }
+
+    next();
+}
+
+module.exports = ensureActiveTheme;

package/core/frontend/services/theme-engine/middleware/index.js

@@ -0,0 +1,6 @@
+module.exports = [
+    require('./ensure-active-theme'),
+    require('./update-global-template-options'),
+    require('./update-local-template-data'),
+    require('./update-local-template-options')
+];

package/core/frontend/services/theme-engine/middleware/update-global-template-options.js

@@ -0,0 +1,116 @@
+const hbs = require('../engine');
+const urlUtils = require('../../../../shared/url-utils');
+const {api} = require('../../proxy');
+const settingsCache = require('../../../../shared/settings-cache');
+const customThemeSettingsCache = require('../../../../shared/custom-theme-settings-cache');
+const labs = require('../../../../shared/labs');
+const activeTheme = require('../active');
+
+function calculateLegacyPriceData(products) {
+    const defaultPrice = {
+        amount: 0,
+        currency: 'usd',
+        interval: 'year',
+        nickname: ''
+    };
+
+    function makePriceObject(price) {
+        const numberAmount = 0 + price.amount;
+        const dollarAmount = numberAmount ? Math.round(numberAmount / 100) : 0;
+        return {
+            valueOf() {
+                return dollarAmount;
+            },
+            amount: numberAmount,
+            currency: price.currency,
+            nickname: price.name,
+            interval: price.interval
+        };
+    }
+
+    const defaultProduct = products[0] || {};
+
+    const monthlyPrice = makePriceObject(defaultProduct.monthly_price || defaultPrice);
+
+    const yearlyPrice = makePriceObject(defaultProduct.yearly_price || defaultPrice);
+
+    const priceData = {
+        monthly: monthlyPrice,
+        yearly: yearlyPrice,
+        currency: monthlyPrice ? monthlyPrice.currency : defaultPrice.currency
+    };
+
+    return priceData;
+}
+
+async function getProductAndPricesData() {
+    try {
+        const page = await api.canary.productsPublic.browse({
+            include: ['monthly_price', 'yearly_price'],
+            limit: 'all'
+        });
+
+        return page.products;
+    } catch (err) {
+        return [];
+    }
+}
+
+function getSiteData() {
+    let siteData = settingsCache.getPublic();
+
+    // theme-only computed property added to @site
+    if (settingsCache.get('members_signup_access') === 'none') {
+        const escapedUrl = encodeURIComponent(urlUtils.urlFor({relativeUrl: '/rss/'}, true));
+        siteData.signup_url = `https://feedly.com/i/subscription/feed/${escapedUrl}`;
+    } else {
+        siteData.signup_url = '#/portal';
+    }
+
+    return siteData;
+}
+
+async function updateGlobalTemplateOptions(req, res, next) {
+    // Static information, same for every request unless the settings change
+    // @TODO: bind this once and then update based on events?
+    // @TODO: decouple theme layer from settings cache using the Content API
+    const siteData = getSiteData();
+    const labsData = labs.getAll();
+
+    const themeData = {
+        posts_per_page: activeTheme.get().config('posts_per_page'),
+        image_sizes: activeTheme.get().config('image_sizes')
+    };
+    const themeSettingsData = customThemeSettingsCache.getAll();
+    const productData = await getProductAndPricesData();
+    const priceData = calculateLegacyPriceData(productData);
+
+    let products = null;
+    let product = null;
+    if (productData.length === 1) {
+        product = productData[0];
+    } else {
+        products = productData;
+    }
+
+    // @TODO: only do this if something changed?
+    // @TODO: remove blog in a major where we are happy to break more themes
+    {
+        hbs.updateTemplateOptions({
+            data: {
+                blog: siteData,
+                site: siteData,
+                labs: labsData,
+                config: themeData,
+                price: priceData,
+                product,
+                products,
+                custom: themeSettingsData
+            }
+        });
+    }
+
+    next();
+}
+
+module.exports = updateGlobalTemplateOptions;