ghost 4.24.0 → 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,14 @@
         margin: 0 .5em;
     }
 
+    .kg-toggle-card-icon {
+        display: none;
+    }
+
+    .kg-toggle-content {
+        margin-top: 0.8rem;
+    }
+
     .kg-nft-card-container {
         position: relative;
         display: flex;

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/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/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/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;

package/core/frontend/services/theme-engine/middleware/update-local-template-data.js

@@ -0,0 +1,9 @@
+function updateLocalTemplateData(req, res, next) {
+    // Pass 'secure' flag to the view engine
+    // so that templates can choose to render https or http 'url', see url utility
+    res.locals.secure = req.secure;
+
+    next();
+}
+
+module.exports = updateLocalTemplateData;

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

@@ -0,0 +1,57 @@
+const _ = require('lodash');
+const hbs = require('../engine');
+const urlUtils = require('../../../../shared/url-utils');
+const customThemeSettingsCache = require('../../../../shared/custom-theme-settings-cache');
+const labs = require('../../../../shared/labs');
+const preview = require('../preview');
+
+function updateLocalTemplateOptions(req, res, next) {
+    const localTemplateOptions = hbs.getLocalTemplateOptions(res.locals);
+
+    // adjust @site.url for http/https based on the incoming request
+    const siteData = {
+        url: urlUtils.urlFor('home', {secure: req.secure, trailingSlash: false}, true)
+    };
+
+    // @TODO: it would be nicer if this was proper middleware somehow...
+    const previewData = preview.handle(req, Object.keys(customThemeSettingsCache.getAll()));
+
+    // strip custom off of preview data so it doesn't get merged into @site
+    const customThemeSettingsPreviewData = previewData.custom;
+    delete previewData.custom;
+    let customData = {};
+    if (labs.isSet('customThemeSettings')) {
+        customData = customThemeSettingsPreviewData;
+    }
+
+    // update site data with any preview values from the request
+    Object.assign(siteData, previewData);
+
+    const member = req.member ? {
+        uuid: req.member.uuid,
+        email: req.member.email,
+        name: req.member.name,
+        firstname: req.member.name && req.member.name.split(' ')[0],
+        avatar_image: req.member.avatar_image,
+        subscriptions: req.member.subscriptions && req.member.subscriptions.map((sub) => {
+            return Object.assign({}, sub, {
+                default_payment_card_last4: sub.default_payment_card_last4 || '****'
+            });
+        }),
+        paid: req.member.status !== 'free'
+    } : null;
+
+    hbs.updateLocalTemplateOptions(res.locals, _.merge({}, localTemplateOptions, {
+        data: {
+            member: member,
+            site: siteData,
+            custom: customData,
+            // @deprecated: a gscan warning for @blog was added before 3.0 which replaced it with @site
+            blog: siteData
+        }
+    }));
+
+    next();
+}
+
+module.exports = updateLocalTemplateOptions;

package/core/frontend/src/cards/css/button.css

@@ -6,6 +6,10 @@
     justify-content: center;
 }
 
+.kg-button-card.kg-align-left {
+    justify-content: flex-start;
+}
+
 a.kg-btn {
     display: flex;
     position: static;

package/core/frontend/src/cards/css/callout.css

@@ -1,43 +1,43 @@
-.kg-card-callout {
+.kg-callout-card {
     display: flex;
     padding: 20px 28px;
     border-radius: 3px;
 }
 
-.kg-card-callout-grey {
+.kg-callout-card-grey {
     background: rgba(124, 139, 154, 0.13);
 }
 
-.kg-card-callout-white {
+.kg-callout-card-white {
     background: transparent;
     box-shadow: inset 0 0 0 1px rgba(124, 139, 154, 0.25);
 }
 
-.kg-card-callout-blue {
+.kg-callout-card-blue {
     background: rgba(33, 172, 232, 0.12);
 }
 
-.kg-card-callout-green {
+.kg-callout-card-green {
     background: rgba(52, 183, 67, 0.12);
 }
 
-.kg-card-callout-yellow {
+.kg-callout-card-yellow {
     background: rgba(240, 165, 15, 0.13);
 }
 
-.kg-card-callout-red {
+.kg-callout-card-red {
     background: rgba(209, 46, 46, 0.11);
 }
 
-.kg-card-callout-pink {
+.kg-callout-card-pink {
     background: rgba(225, 71, 174, 0.11);
 }
 
-.kg-card-callout-purple {
+.kg-callout-card-purple {
     background: rgba(135, 85, 236, 0.12);
 }
 
-.kg-card-callout-accent {
+.kg-callout-card-accent {
     background: var(--ghost-accent-color);
     color: #fff;
 }

package/core/frontend/web/middleware/error-handler.js

@@ -0,0 +1,93 @@
+const hbs = require('express-hbs');
+const _ = require('lodash');
+const tpl = require('@tryghost/tpl');
+const sentry = require('../../../shared/sentry');
+
+const config = require('../../../shared/config');
+const helpers = require('../../services/routing/helpers');
+
+// @TODO: make this properly shared code
+const shared = require('../../../server/web/shared/middleware/error-handler');
+
+const messages = {
+    oopsErrorTemplateHasError: 'Oops, seems there is an error in the error template.',
+    encounteredError: 'Encountered the error: ',
+    whilstTryingToRender: 'whilst trying to render an error page for the error: '
+};
+
+const escapeExpression = hbs.Utils.escapeExpression;
+
+/**
+ * This is a bare minimum setup, which allows us to render the error page
+ * It uses the {{asset}} helper, and nothing more
+ */
+const createHbsEngine = () => {
+    const engine = hbs.create();
+    engine.registerHelper('asset', require('../../helpers/asset'));
+
+    return engine.express4();
+};
+
+const errorFallbackMessage = err => `<h1>${tpl(messages.oopsErrorTemplateHasError)}</h1>
+     <p>${tpl(messages.encounteredError)}</p>
+     <pre>${escapeExpression(err.message || err)}</pre>
+     <br ><p>${tpl(messages.whilstTryingToRender)}</p>
+     ${err.statusCode} <pre>${escapeExpression(err.message || err)}</pre>`;
+
+const themeErrorRenderer = (err, req, res, next) => {
+    // If the error code is explicitly set to STATIC_FILE_NOT_FOUND,
+    // Skip trying to render an HTML error, and move on to the basic error renderer
+    // We do this because customised 404 templates could reference the image that's missing
+    // A better long term solution might be to do this based on extension
+    if (err.code === 'STATIC_FILE_NOT_FOUND') {
+        return next(err);
+    }
+
+    // Renderer begin
+    // Format Data
+    const data = {
+        message: err.message,
+        // @deprecated Remove in Ghost 5.0
+        code: err.statusCode,
+        statusCode: err.statusCode,
+        errorDetails: err.errorDetails || []
+    };
+
+    // Template
+    // @TODO: very dirty !!!!!!
+    helpers.templates.setTemplate(req, res);
+
+    // It can be that something went wrong with the theme or otherwise loading handlebars
+    // This ensures that no matter what res.render will work here
+    // @TODO: split the error handler for assets, admin & theme to refactor this away
+    if (_.isEmpty(req.app.engines)) {
+        res._template = 'error';
+        req.app.engine('hbs', createHbsEngine());
+        req.app.set('view engine', 'hbs');
+        req.app.set('views', config.get('paths').defaultViews);
+    }
+
+    // @TODO use renderer here?!
+    // Render Call - featuring an error handler for what happens if rendering fails
+    res.render(res._template, data, (_err, html) => {
+        if (!_err) {
+            return res.send(html);
+        }
+
+        // re-attach new error e.g. error template has syntax error or misusage
+        req.err = _err;
+
+        // And then try to explain things to the user...
+        // Cheat and output the error using handlebars escapeExpression
+        return res.status(500).send(errorFallbackMessage(_err));
+    });
+};
+
+module.exports.handleThemeResponse = [
+    // Make sure the error can be served
+    shared.prepareError,
+    // Handle the error in Sentry
+    sentry.errorHandler,
+    // Render the error using theme template
+    themeErrorRenderer
+];

package/core/frontend/web/middleware/handle-image-sizes.js

@@ -1,6 +1,6 @@
 const _ = require('lodash');
 const path = require('path');
-const {GhostError} = require('@tryghost/errors');
+const {NoContentError} = require('@tryghost/errors');
 const imageTransform = require('@tryghost/image-transform');
 const storage = require('../../../server/adapters/storage');
 const activeTheme = require('../../services/theme-engine/active');
@@ -102,10 +102,7 @@ module.exports = function (req, res, next) {
             })
             .then((originalImageBuffer) => {
                 if (originalImageBuffer.length <= 0) {
-                    throw new GhostError({
-                        errorType: 'NoContentError',
-                        statusCode: 204
-                    });
+                    throw new NoContentError();
                 }
                 return imageTransform.resizeFromBuffer(originalImageBuffer, imageDimensionConfig);
             })
@@ -115,7 +112,7 @@ module.exports = function (req, res, next) {
     }).then(() => {
         next();
     }).catch(function (err) {
-        if (err.code === 'SHARP_INSTALLATION' || err.errorType === 'NoContentError') {
+        if (err.code === 'SHARP_INSTALLATION' || err.code === 'IMAGE_PROCESSING' || err.errorType === 'NoContentError') {
             return redirectToOriginal();
         }
         next(err);

package/core/frontend/web/middleware/index.js

@@ -1,4 +1,5 @@
 module.exports = {
+    errorHandler: require('./error-handler'),
     handleImageSizes: require('./handle-image-sizes'),
     redirectGhostToAdmin: require('./redirect-ghost-to-admin'),
     serveFavicon: require('./serve-favicon'),

package/core/frontend/web/site.js

@@ -184,7 +184,7 @@ module.exports = function setupSiteApp(options = {}) {
             app.setupErrorHandling(siteApp);
         }
     });
-    siteApp.use(shared.middleware.errorHandler.handleThemeResponse);
+    siteApp.use(mw.errorHandler.handleThemeResponse);
 
     debug('Site setup end');
 

package/core/server/adapters/scheduling/SchedulingDefault.js

@@ -307,7 +307,7 @@ SchedulingDefault.prototype._pingUrl = function (object) {
                 this._pingUrl(object);
             }, this.retryTimeoutInMs);
 
-            logging.error(new errors.GhostError({
+            logging.error(new errors.InternalServerError({
                 err,
                 context: 'Retrying...',
                 level: 'normal'
@@ -316,7 +316,7 @@ SchedulingDefault.prototype._pingUrl = function (object) {
             return;
         }
 
-        logging.error(new errors.GhostError({
+        logging.error(new errors.InternalServerError({
             err,
             level: 'critical'
         }));

package/core/server/adapters/storage/LocalStorageBase.js

@@ -147,7 +147,7 @@ class LocalStorageBase extends StorageBase {
                         return next(new errors.NoPermissionError({err: err}));
                     }
 
-                    return next(new errors.GhostError({err: err}));
+                    return next(new errors.InternalServerError({err: err}));
                 }
 
                 next();
@@ -196,7 +196,7 @@ class LocalStorageBase extends StorageBase {
                         return reject(new errors.NoPermissionError({err: err}));
                     }
 
-                    return reject(new errors.GhostError({
+                    return reject(new errors.InternalServerError({
                         err: err,
                         message: tpl(this.errorMessages.cannotRead, {file: options.path})
                     }));

package/core/server/api/canary/db.js

@@ -62,7 +62,7 @@ module.exports = {
             return Promise.resolve()
                 .then(() => exporter.doExport({include: frame.options.withRelated}))
                 .catch((err) => {
-                    return Promise.reject(new errors.GhostError({err: err}));
+                    return Promise.reject(new errors.InternalServerError({err: err}));
                 });
         }
     },
@@ -124,7 +124,7 @@ module.exports = {
                             }, {concurrency: 100});
                         })
                         .catch((err) => {
-                            throw new errors.GhostError({
+                            throw new errors.InternalServerError({
                                 err: err
                             });
                         });

package/core/server/api/canary/media.js

@@ -23,8 +23,9 @@ module.exports = {
 
     uploadThumbnail: {
         permissions: false,
-        options: [
-            'url'
+        data: [
+            'url',
+            'ref'
         ],
         async query(frame) {
             const mediaStorage = storage.getStorage('media');

package/core/server/api/canary/oembed.js

@@ -3,9 +3,24 @@ const externalRequest = require('../../lib/request-external');
 
 const OEmbed = require('../../services/oembed');
 const oembed = new OEmbed({config, externalRequest});
+
 const NFT = require('../../services/nft-oembed');
-const nft = new NFT();
+const nft = new NFT({
+    config: {
+        apiKey: config.get('opensea').privateReadOnlyApiKey
+    }
+});
+
+const Twitter = require('../../services/twitter-embed');
+const twitter = new Twitter({
+    config: {
+        bearerToken: config.get('twitter').privateReadOnlyToken
+    },
+    logging: require('@tryghost/logging')
+});
+
 oembed.registerProvider(nft);
+oembed.registerProvider(twitter);
 
 module.exports = {
     docName: 'oembed',

package/core/server/api/canary/session.js

@@ -42,7 +42,7 @@ const session = {
                 });
             });
         }).catch(async (err) => {
-            if (!errors.utils.isIgnitionError(err)) {
+            if (!errors.utils.isGhostError(err)) {
                 throw new errors.UnauthorizedError({
                     message: tpl(messages.accessDenied),
                     err

package/core/server/api/canary/slugs.js

@@ -43,7 +43,7 @@ module.exports = {
             return models.Base.Model.generateSlug(allowedTypes[frame.options.type], frame.data.name, {status: 'all'})
                 .then((slug) => {
                     if (!slug) {
-                        return Promise.reject(new errors.GhostError({
+                        return Promise.reject(new errors.InternalServerError({
                             message: tpl(messages.couldNotGenerateSlug)
                         }));
                     }

package/core/server/api/canary/utils/permissions.js

@@ -66,11 +66,11 @@ const nonePublicAuth = (apiConfig, frame) => {
             return Promise.reject(err);
         }
 
-        if (errors.utils.isIgnitionError(err)) {
+        if (errors.utils.isGhostError(err)) {
             return Promise.reject(err);
         }
 
-        return Promise.reject(new errors.GhostError({
+        return Promise.reject(new errors.InternalServerError({
             err: err
         }));
     });

package/core/server/api/canary/utils/serializers/output/config.js

@@ -1,5 +1,4 @@
 const _ = require('lodash');
-const labs = require('../../../../../../shared/labs');
 const debug = require('@tryghost/debug')('api:canary:utils:serializers:output:config');
 
 module.exports = {
@@ -18,13 +17,10 @@ module.exports = {
             'stripeDirect',
             'mailgunIsConfigured',
             'emailAnalytics',
-            'hostSettings'
+            'hostSettings',
+            'tenor'
         ];
 
-        if (labs.isSet('gifsCard')) {
-            keys.push('tenor');
-        }
-
         frame.response = {
             config: _.pick(data, keys)
         };