ghost 4.13.0 → 4.16.0

package/core/frontend/helpers/ghost_head.js

@@ -2,7 +2,7 @@
 // Usage: `{{ghost_head}}`
 //
 // Outputs scripts and other assets at the top of a Ghost theme
-const {metaData, escapeExpression, SafeString, logging, settingsCache, config, blogIcon, urlUtils} = require('../services/proxy');
+const {metaData, escapeExpression, SafeString, logging, settingsCache, config, blogIcon, urlUtils, labs} = require('../services/proxy');
 const _ = require('lodash');
 const debug = require('@tryghost/debug')('ghost_head');
 const templateStyles = require('./tpl/styles');
@@ -176,6 +176,12 @@ module.exports = function ghost_head(options) { // eslint-disable-line camelcase
             head.push('<meta name="generator" content="Ghost ' +
                 escapeExpression(safeVersion) + '" />');
 
+            // Ghost analytics tag
+            if (labs.isSet('membersActivity')) {
+                const postId = (dataRoot && dataRoot.post) ? dataRoot.post.id : '';
+                head.push(writeMetaTag('ghost-analytics-id', postId, 'name'));
+            }
+
             head.push('<link rel="alternate" type="application/rss+xml" title="' +
                 escapeExpression(meta.site.title) + '" href="' +
                 escapeExpression(meta.rssUrl) + '" />');

package/core/frontend/helpers/match.js

@@ -2,20 +2,35 @@ const {logging, i18n, SafeString, labs} = require('../services/proxy');
 const _ = require('lodash');
 
 /**
- * This is identical to the built-in if helper
+ * This is identical to the built-in if helper, except inverse/fn calls are replaced with false/true
+ * https://github.com/handlebars-lang/handlebars.js/blob/19bdace85a8d0bc5ed3a4dec4071cb08c8d003f2/lib/handlebars/helpers/if.js#L9-L20
  */
+function isEmptyValue(value) {
+    if (!value && value !== 0) {
+        return true;
+    } else if (Array.isArray(value) && value.length === 0) {
+        return true;
+    } else {
+        return false;
+    }
+}
+
 const handleConditional = (conditional, options) => {
     if (_.isFunction(conditional)) {
         conditional = conditional.call(this);
     }
 
+    if (conditional instanceof SafeString) {
+        conditional = conditional.string;
+    }
+
     // Default behavior is to render the positive path if the value is truthy and not empty.
     // The `includeZero` option may be set to treat the condtional as purely not empty based on the
     // behavior of isEmpty. Effectively this determines if 0 is handled by the positive path or negative.
-    if ((!options.hash.includeZero && !conditional) || _.isEmpty(conditional)) {
-        return true;
-    } else {
+    if ((!options.hash.includeZero && !conditional) || isEmptyValue(conditional)) {
         return false;
+    } else {
+        return true;
     }
 };
 

package/core/frontend/helpers/products.js

@@ -0,0 +1,68 @@
+// # Products Helper
+// Usage: `{{products}}`, `{{products separator=' - '}}`
+//
+// Returns a string of the products with access to the post.
+// By default, products are separated by commas.
+
+const nql = require('@nexes/nql');
+const isString = require('lodash/isString');
+const {SafeString, labs} = require('../services/proxy');
+
+function products(options = {}) {
+    options = options || {};
+    options.hash = options.hash || {};
+
+    const separator = isString(options.hash.separator) ? options.hash.separator : '';
+    let output = '';
+
+    let productsList = [];
+    if (options.data.product) {
+        productsList = [options.data.product];
+    }
+    if (options.data.products) {
+        productsList = options.data.products;
+    }
+    let accessProductsList = [];
+
+    if (['members', 'paid', 'public'].includes(this.visibility)) {
+        accessProductsList = productsList;
+    }
+
+    if (this.visibility === 'filter') {
+        const nqlFilter = nql(this.visibility_filter);
+        accessProductsList = productsList.filter((product) => {
+            return nqlFilter.queryJSON({product: product.slug});
+        });
+    }
+
+    if (accessProductsList.length > 0) {
+        const productNames = accessProductsList.map(product => product.name);
+        if (accessProductsList.length === 1) {
+            output = productNames[0] + ' tier';
+        } else {
+            if (separator) {
+                output = productNames.join(separator) + ' tiers';
+            } else {
+                const firsts = productNames.slice(0, productNames.length - 1);
+                const last = productNames[productNames.length - 1];
+                output = firsts.join(', ') + ' and ' + last + ' tiers';
+            }
+        }
+    }
+
+    return new SafeString(output);
+}
+
+module.exports = function productsLabsWrapper() {
+    let self = this;
+    let args = arguments;
+
+    return labs.enabledHelper({
+        flagKey: 'multipleProducts',
+        flagName: 'Tiers',
+        helperName: 'products',
+        helpUrl: 'https://ghost.org/docs/themes/'
+    }, () => {
+        return products.apply(self, args);
+    });
+};

package/core/frontend/helpers/tpl/content-cta.hbs

@@ -8,7 +8,7 @@
             <h2>This post is for subscribers only</h2>
         {{/has}}
         {{#has visibility="filter"}}
-            <h2>This post is for subscribers on a higher tier only</h2>
+            <h2>This post is for subscribers on the {{products}} only </h2>
         {{/has}}
         {{#if @member}}
             <a class="gh-btn" data-portal="account/plans" style="color:{{accentColor}}">Upgrade your account</a>

package/core/frontend/services/routing/controllers/email-post.js

@@ -3,6 +3,7 @@ const config = require('../../../../shared/config');
 const urlService = require('../../url');
 const urlUtils = require('../../../../shared/url-utils');
 const helpers = require('../helpers');
+const labs = require('../../../../shared/labs');
 
 /**
  * @description Email Post Controller.
@@ -11,7 +12,7 @@ const helpers = require('../helpers');
  * @param {Function} next
  * @returns {Promise}
  */
-module.exports = function emailPostController(req, res, next) {
+module.exports = [labs.enabledMiddleware('emailOnlyPosts'), function emailPostController(req, res, next) {
     debug('emailPostController');
 
     const api = require('../../proxy').api[res.locals.apiVersion];
@@ -62,4 +63,4 @@ module.exports = function emailPostController(req, res, next) {
             return renderer(post);
         })
         .catch(helpers.handleError(next));
-};
+}];

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

@@ -22,7 +22,7 @@ const getSettingFilePath = (setting) => {
 
 /**
  * Functionally same as loadSettingsSync with exception of loading
- * settigs asyncronously. This method is used at new places to read settings
+ * settings asynchronously. This method is used at new places to read settings
  * to prevent blocking the eventloop
  *
  * @param {String} setting the requested settings as defined in setting knownSettings
@@ -56,7 +56,7 @@ const loadSettings = async (setting) => {
 /**
  * Reads the desired settings YAML file and passes the
  * file to the YAML parser which then returns a JSON object.
- * NOTE: loading happens syncronously
+ * NOTE: loading happens synchronously
  *
  * @param {String} setting the requested settings as defined in setting knownSettings
  * @returns {Object} settingsFile

package/core/frontend/services/sitemap/base-generator.js

@@ -19,30 +19,34 @@ class BaseSiteMapGenerator {
         this.nodeTimeLookup = {};
         this.siteMapContent = null;
         this.lastModified = 0;
+        this.maxNodes = 50000;
     }
 
     generateXmlFromNodes() {
-        const self = this;
-
         // Get a mapping of node to timestamp
-        const timedNodes = _.map(this.nodeLookup, function (node, id) {
+        let nodesToProcess = _.map(this.nodeLookup, (node, id) => {
             return {
                 id: id,
                 // Using negative here to sort newest to oldest
-                ts: -(self.nodeTimeLookup[id] || 0),
+                ts: -(this.nodeTimeLookup[id] || 0),
                 node: node
             };
-        }, []);
+        });
+
+        // Limit to 50k nodes - this is a quick fix to prevent errors in google console
+        if (this.maxNodes) {
+            nodesToProcess = nodesToProcess.slice(0, this.maxNodes);
+        }
 
         // Sort nodes by timestamp
-        const sortedNodes = _.sortBy(timedNodes, 'ts');
+        nodesToProcess = _.sortBy(nodesToProcess, 'ts');
 
         // Grab just the nodes
-        const urlElements = _.map(sortedNodes, 'node');
+        nodesToProcess = _.map(nodesToProcess, 'node');
 
         const data = {
             // Concat the elements to the _attr declaration
-            urlset: [XMLNS_DECLS].concat(urlElements)
+            urlset: [XMLNS_DECLS].concat(nodesToProcess)
         };
 
         // Generate full xml

package/core/frontend/services/sitemap/manager.js

@@ -15,7 +15,7 @@ class SiteMapManager {
         this.posts = options.posts || this.createPostsGenerator(options);
         this.users = this.authors = options.authors || this.createUsersGenerator(options);
         this.tags = options.tags || this.createTagsGenerator(options);
-        this.index = options.index || this.createIndexGenerator(options);
+        this.index = options.index || this.createIndexGenerator();
 
         events.on('router.created', (router) => {
             if (router.name === 'StaticRoutesRouter') {

package/core/frontend/services/theme-engine/handlebars/helpers.js

@@ -12,6 +12,7 @@ const registerAllCoreHelpers = function registerAllCoreHelpers() {
     registerThemeHelper('cancel_link', coreHelpers.cancel_link);
     registerThemeHelper('concat', coreHelpers.concat);
     registerThemeHelper('content', coreHelpers.content);
+    registerThemeHelper('products', coreHelpers.products);
     registerThemeHelper('date', coreHelpers.date);
     registerThemeHelper('encode', coreHelpers.encode);
     registerThemeHelper('excerpt', coreHelpers.excerpt);

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

@@ -5,6 +5,7 @@ const {api} = require('../proxy');
 const errors = require('@tryghost/errors');
 const tpl = require('@tryghost/tpl');
 const settingsCache = require('../../../shared/settings-cache');
+const customThemeSettingsCache = require('../../../shared/custom-theme-settings-cache');
 const labs = require('../../../shared/labs');
 const activeTheme = require('./active');
 const preview = require('./preview');
@@ -114,6 +115,7 @@ async function updateGlobalTemplateOptions(req, res, next) {
         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);
 
@@ -136,7 +138,8 @@ async function updateGlobalTemplateOptions(req, res, next) {
                 config: themeData,
                 price: priceData,
                 product,
-                products
+                products,
+                custom: themeSettingsData
             }
         });
     }

package/core/server/api/canary/email-preview.js

@@ -2,7 +2,10 @@ const models = require('../../models');
 const i18n = require('../../../shared/i18n');
 const errors = require('@tryghost/errors');
 const mega = require('../../services/mega');
-const labs = require('../../../shared/labs');
+
+const emailPreview = new mega.EmailPreview({
+    apiVersion: 'canary'
+});
 
 module.exports = {
     docName: 'email_preview',
@@ -22,34 +25,19 @@ module.exports = {
             'status'
         ],
         permissions: true,
-        query(frame) {
+        async query(frame) {
             const options = Object.assign(frame.options, {formats: 'html,plaintext', withRelated: ['authors', 'posts_meta']});
             const data = Object.assign(frame.data, {status: 'all'});
-            return models.Post.findOne(data, options)
-                .then((model) => {
-                    if (!model) {
-                        throw new errors.NotFoundError({
-                            message: i18n.t('errors.api.posts.postNotFound')
-                        });
-                    }
-
-                    return mega.postEmailSerializer.serialize(model, {isBrowserPreview: true, apiVersion: 'canary'}).then((emailContent) => {
-                        if (labs.isSet('emailCardSegments') && frame.options.memberSegment) {
-                            emailContent = mega.postEmailSerializer.renderEmailForSegment(emailContent, frame.options.memberSegment);
-                        }
-
-                        const replacements = mega.postEmailSerializer.parseReplacements(emailContent);
 
-                        replacements.forEach((replacement) => {
-                            emailContent[replacement.format] = emailContent[replacement.format].replace(
-                                replacement.match,
-                                replacement.fallback || ''
-                            );
-                        });
+            const model = await models.Post.findOne(data, options);
 
-                        return emailContent;
-                    });
+            if (!model) {
+                throw new errors.NotFoundError({
+                    message: i18n.t('errors.api.posts.postNotFound')
                 });
+            }
+
+            return emailPreview.generateEmailContent(model, frame.options.memberSegment);
         }
     },
     sendTestEmail: {
@@ -69,21 +57,15 @@ module.exports = {
         async query(frame) {
             const options = Object.assign(frame.options, {status: 'all'});
             let model = await models.Post.findOne(options, {withRelated: ['authors']});
+
             if (!model) {
                 throw new errors.NotFoundError({
                     message: i18n.t('errors.api.posts.postNotFound')
                 });
             }
+
             const {emails = [], memberSegment} = frame.data;
-            const response = await mega.mega.sendTestEmail(model, emails, 'canary', memberSegment);
-            if (response && response[0] && response[0].error) {
-                throw new errors.EmailError({
-                    statusCode: response[0].error.statusCode,
-                    message: response[0].error.message,
-                    context: response[0].error.originalMessage
-                });
-            }
-            return response;
+            return await mega.mega.sendTestEmail(model, emails, 'canary', memberSegment);
         }
     }
 };

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

@@ -1,6 +1,12 @@
 const i18n = require('../../../shared/i18n');
 const errors = require('@tryghost/errors');
 const models = require('../../models');
+const getIntegrationsServiceInstance = require('../../services/integrations/integrations-service');
+
+const integrationsService = getIntegrationsServiceInstance({
+    IntegrationModel: models.Integration,
+    ApiKeyModel: models.ApiKey
+});
 
 module.exports = {
     docName: 'integrations',
@@ -76,36 +82,7 @@ module.exports = {
             }
         },
         query({data, options}) {
-            if (options.keyid) {
-                return models.ApiKey.findOne({id: options.keyid})
-                    .then(async (model) => {
-                        if (!model) {
-                            throw new errors.NotFoundError({
-                                message: i18n.t('errors.api.resource.resourceNotFound', {
-                                    resource: 'ApiKey'
-                                })
-                            });
-                        }
-                        try {
-                            await models.ApiKey.refreshSecret(model.toJSON(), Object.assign({}, options, {id: options.keyid}));
-                            return models.Integration.findOne({id: options.id}, {
-                                withRelated: ['api_keys', 'webhooks']
-                            });
-                        } catch (err) {
-                            throw new errors.GhostError({
-                                err: err
-                            });
-                        }
-                    });
-            }
-            return models.Integration.edit(data, Object.assign(options, {require: true}))
-                .catch(models.Integration.NotFoundError, () => {
-                    throw new errors.NotFoundError({
-                        message: i18n.t('errors.api.resource.resourceNotFound', {
-                            resource: 'Integration'
-                        })
-                    });
-                });
+            return integrationsService.edit(data, options);
         }
     },
     add: {

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

@@ -76,16 +76,15 @@ module.exports = {
             }
         },
         permissions: true,
-        async query(frame) {
-            try {
-                return await models.Label.add(frame.data.labels[0], frame.options);
-            } catch (error) {
-                if (error.code && error.message.toLowerCase().indexOf('unique') !== -1) {
-                    throw new errors.ValidationError({message: i18n.t('errors.api.labels.labelAlreadyExists')});
-                }
+        query(frame) {
+            return models.Label.add(frame.data.labels[0], frame.options)
+                .catch((error) => {
+                    if (error.code && error.message.toLowerCase().indexOf('unique') !== -1) {
+                        throw new errors.ValidationError({message: i18n.t('errors.api.labels.labelAlreadyExists')});
+                    }
 
-                throw error;
-            }
+                    throw error;
+                });
         }
     },
 

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

@@ -124,8 +124,10 @@ module.exports = {
                     }, frame.options);
                 }
 
-                if (frame.data.members[0].comped) {
-                    await membersService.api.members.setComplimentarySubscription(member);
+                if (!labsService.isSet('multipleProducts')) {
+                    if (frame.data.members[0].comped) {
+                        await membersService.api.members.setComplimentarySubscription(member);
+                    }
                 }
 
                 if (frame.options.send_email) {
@@ -188,14 +190,16 @@ module.exports = {
 
                 const hasCompedSubscription = !!member.related('stripeSubscriptions').find(sub => sub.get('plan_nickname') === 'Complimentary' && sub.get('status') === 'active');
 
-                if (typeof frame.data.members[0].comped === 'boolean') {
-                    if (frame.data.members[0].comped && !hasCompedSubscription) {
-                        await membersService.api.members.setComplimentarySubscription(member);
-                    } else if (!(frame.data.members[0].comped) && hasCompedSubscription) {
-                        await membersService.api.members.cancelComplimentarySubscription(member);
-                    }
+                if (!labsService.isSet('multipleProducts')) {
+                    if (typeof frame.data.members[0].comped === 'boolean') {
+                        if (frame.data.members[0].comped && !hasCompedSubscription) {
+                            await membersService.api.members.setComplimentarySubscription(member);
+                        } else if (!(frame.data.members[0].comped) && hasCompedSubscription) {
+                            await membersService.api.members.cancelComplimentarySubscription(member);
+                        }
 
-                    await member.load(['stripeSubscriptions', 'products', 'stripeSubscriptions.stripePrice', 'stripeSubscriptions.stripePrice.stripeProduct']);
+                        await member.load(['stripeSubscriptions', 'products', 'stripeSubscriptions.stripePrice', 'stripeSubscriptions.stripePrice.stripeProduct']);
+                    }
                 }
 
                 await member.load(['stripeSubscriptions.customer', 'stripeSubscriptions.stripePrice', 'stripeSubscriptions.stripePrice.stripeProduct']);

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

@@ -1,11 +1,6 @@
-const _ = require('lodash');
-const moment = require('moment');
-const config = require('../../../shared/config');
 const models = require('../../models');
-const urlUtils = require('../../../shared/url-utils');
-const i18n = require('../../../shared/i18n');
-const errors = require('@tryghost/errors');
-const api = require('./index');
+
+const postSchedulingService = require('../../services/posts/post-scheduling-service')('canary');
 
 module.exports = {
     docName: 'schedules',
@@ -32,11 +27,8 @@ module.exports = {
         permissions: {
             docName: 'posts'
         },
-        query(frame) {
-            let resource;
+        async query(frame) {
             const resourceType = frame.options.resource;
-            const publishAPostBySchedulerToleranceInMinutes = config.get('times').publishAPostBySchedulerToleranceInMinutes;
-
             const options = {
                 status: 'scheduled',
                 id: frame.options.id,
@@ -45,53 +37,13 @@ module.exports = {
                 }
             };
 
-            return api[resourceType].read({id: frame.options.id}, options)
-                .then((result) => {
-                    resource = result[resourceType][0];
-                    const publishedAtMoment = moment(resource.published_at);
-
-                    if (publishedAtMoment.diff(moment(), 'minutes') > publishAPostBySchedulerToleranceInMinutes) {
-                        return Promise.reject(new errors.NotFoundError({message: i18n.t('errors.api.job.notFound')}));
-                    }
-
-                    if (publishedAtMoment.diff(moment(), 'minutes') < publishAPostBySchedulerToleranceInMinutes * -1 && frame.data.force !== true) {
-                        return Promise.reject(new errors.NotFoundError({message: i18n.t('errors.api.job.publishInThePast')}));
-                    }
+            const {scheduledResource, preScheduledResource} = await postSchedulingService.publish(resourceType, frame.options.id, frame.data.force, options);
+            const cacheInvalidate = postSchedulingService.handleCacheInvalidation(scheduledResource, preScheduledResource);
+            this.headers.cacheInvalidate = cacheInvalidate;
 
-                    const editedResource = {};
-                    editedResource[resourceType] = [{
-                        status: 'published',
-                        updated_at: moment(resource.updated_at).toISOString(true)
-                    }];
-
-                    return api[resourceType].edit(
-                        editedResource,
-                        _.pick(options, ['context', 'id', 'transacting', 'forUpdate'])
-                    );
-                })
-                .then((result) => {
-                    const scheduledResource = result[resourceType][0];
-
-                    if (
-                        (scheduledResource.status === 'published' && resource.status !== 'published') ||
-                        (scheduledResource.status === 'draft' && resource.status === 'published')
-                    ) {
-                        this.headers.cacheInvalidate = true;
-                    } else if (
-                        (scheduledResource.status === 'draft' && resource.status !== 'published') ||
-                        (scheduledResource.status === 'scheduled' && resource.status !== 'scheduled')
-                    ) {
-                        this.headers.cacheInvalidate = {
-                            value: urlUtils.urlFor({
-                                relativeUrl: urlUtils.urlJoin('/p', scheduledResource.uuid, '/')
-                            })
-                        };
-                    } else {
-                        this.headers.cacheInvalidate = false;
-                    }
-
-                    return result;
-                });
+            const response = {};
+            response[resourceType] = [scheduledResource];
+            return response;
         }
     },