ghost 4.34.3 → 4.35.0

package/core/frontend/helpers/prev_post.js

@@ -27,7 +27,7 @@ const buildApiOptions = function buildApiOptions(options, post) {
         /**
          * @deprecated: single authors was superceded by multiple authors in Ghost 1.22.0
          */
-        include: 'author,authors,tags',
+        include: 'author,authors,tags,tiers',
         order: 'published_at ' + order,
         limit: 1,
         // This line deliberately uses double quotes because GQL cannot handle either double quotes

package/core/frontend/helpers/products.js

@@ -6,7 +6,6 @@
 const {labs} = require('../services/proxy');
 const {SafeString} = require('../services/rendering');
 
-const nql = require('@nexes/nql');
 const isString = require('lodash/isString');
 
 function products(options = {}) {
@@ -29,11 +28,8 @@ function products(options = {}) {
         accessProductsList = productsList;
     }
 
-    if (this.visibility === 'filter') {
-        const nqlFilter = nql(this.visibility_filter);
-        accessProductsList = productsList.filter((product) => {
-            return nqlFilter.queryJSON({product: product.slug});
-        });
+    if (this.visibility === 'tiers') {
+        accessProductsList = this.tiers;
     }
 
     if (accessProductsList.length > 0) {

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

@@ -7,7 +7,7 @@
         {{#has visibility="members"}}
             <h2>This post is for subscribers only</h2>
         {{/has}}
-        {{#has visibility="filter"}}
+        {{#has visibility="tiers"}}
             <h2>This post is for subscribers on the {{products}} only </h2>
         {{/has}}
         {{#if @member}}

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

@@ -18,7 +18,7 @@ module.exports = function emailPostController(req, res, next) {
 
     const params = {
         uuid: req.params.uuid,
-        include: 'authors,tags',
+        include: 'authors,tags,tiers',
         context: {
             member: res.locals.member
         }

package/core/frontend/services/routing/controllers/preview.js

@@ -19,7 +19,7 @@ module.exports = function previewController(req, res, next) {
     const params = {
         uuid: req.params.uuid,
         status: 'all',
-        include: 'authors,tags'
+        include: 'authors,tags,tiers'
     };
 
     return api[res.routerOptions.query.controller]

package/core/frontend/services/routing/controllers/static.js

@@ -13,7 +13,7 @@ function processQuery(query, locals) {
     //       We override the `include` property for now, because the full data set is required anyway.
     if (_.get(query, 'resource') === 'posts' || _.get(query, 'resource') === 'pages') {
         _.extend(query.options, {
-            include: 'authors,tags'
+            include: 'authors,tags,tiers'
         });
     }
 

package/core/frontend/services/routing/helpers/entry-lookup.js

@@ -39,7 +39,7 @@ function entryLookup(postUrl, routerOptions, locals) {
     }
 
     let options = {
-        include: 'authors,tags'
+        include: 'authors,tags,tiers'
     };
 
     options.context = {member: locals.member};

package/core/frontend/services/routing/helpers/fetch-data.js

@@ -19,7 +19,7 @@ const queryDefaults = {
  */
 const defaultQueryOptions = {
     options: {
-        include: 'authors,tags'
+        include: 'authors,tags,tiers'
     }
 };
 

package/core/frontend/views/unsubscribe.hbs

@@ -42,8 +42,10 @@
                                 {{#if member}}
                                     <p>
                                         <span class="gh-flow-em">{{member.email}}</span> has been successfully unsubscribed from emails.
-                                        <br>
-                                        Don't worry, this will not cancel your paid subscription to {{@site.title}}.
+                                        {{#match member.status "!=" "free"}}
+                                            <br>
+                                            Don't worry, this will not cancel your paid subscription to {{@site.title}}.
+                                        {{/match}}
                                     </p>
                                     <p>Didn't mean to do this? Manage your account <a href="{{@site.url}}/#/portal/account">here</a>.</p>
                                 {{/if}}

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

@@ -1,7 +1,7 @@
 const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 const models = require('../../models');
-const ALLOWED_INCLUDES = ['authors', 'tags'];
+const ALLOWED_INCLUDES = ['authors', 'tags', 'tiers'];
 
 const messages = {
     postNotFound: 'Post not found.'

package/core/server/api/canary/pages-public.js

@@ -1,7 +1,7 @@
 const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 const models = require('../../models');
-const ALLOWED_INCLUDES = ['tags', 'authors'];
+const ALLOWED_INCLUDES = ['tags', 'authors', 'tiers'];
 
 const messages = {
     pageNotFound: 'Page not found.'

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

@@ -2,7 +2,7 @@ const models = require('../../models');
 const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 const getPostServiceInstance = require('../../services/posts/posts-service');
-const ALLOWED_INCLUDES = ['tags', 'authors', 'authors.roles'];
+const ALLOWED_INCLUDES = ['tags', 'authors', 'authors.roles', 'tiers'];
 const UNSAFE_ATTRS = ['status', 'authors', 'visibility'];
 
 const messages = {

package/core/server/api/canary/posts-public.js

@@ -1,7 +1,7 @@
 const models = require('../../models');
 const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
-const allowedIncludes = ['tags', 'authors'];
+const allowedIncludes = ['tags', 'authors', 'tiers'];
 
 const messages = {
     postNotFound: 'Post not found.'

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

@@ -2,7 +2,7 @@ const models = require('../../models');
 const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 const getPostServiceInstance = require('../../services/posts/posts-service');
-const allowedIncludes = ['tags', 'authors', 'authors.roles', 'email'];
+const allowedIncludes = ['tags', 'authors', 'authors.roles', 'email', 'tiers'];
 const unsafeAttrs = ['status', 'authors', 'visibility'];
 
 const messages = {

package/core/server/api/canary/utils/serializers/input/pages.js

@@ -38,7 +38,7 @@ function defaultRelations(frame) {
         return false;
     }
 
-    frame.options.withRelated = ['tags', 'authors', 'authors.roles'];
+    frame.options.withRelated = ['tags', 'authors', 'authors.roles', 'tiers'];
 }
 
 function setDefaultOrder(frame) {
@@ -102,13 +102,6 @@ const forceStatusFilter = (frame) => {
     }
 };
 
-const transformPageVisibilityFilters = (frame) => {
-    if (frame.data.pages[0].visibility === 'filter' && frame.data.pages[0].visibility_filter) {
-        frame.data.pages[0].visibility = frame.data.pages[0].visibility_filter;
-    }
-    delete frame.data.pages[0].visibility_filter;
-};
-
 module.exports = {
     browse(apiConfig, frame) {
         debug('browse');
@@ -187,7 +180,6 @@ module.exports = {
             });
         }
 
-        transformPageVisibilityFilters(frame);
         handlePostsMeta(frame);
         defaultFormat(frame);
         defaultRelations(frame);

package/core/server/api/canary/utils/serializers/input/posts.js

@@ -38,7 +38,7 @@ function defaultRelations(frame) {
         return false;
     }
 
-    frame.options.withRelated = ['tags', 'authors', 'authors.roles', 'email'];
+    frame.options.withRelated = ['tags', 'authors', 'authors.roles', 'email', 'tiers'];
 }
 
 function setDefaultOrder(frame) {
@@ -111,13 +111,6 @@ const transformLegacyEmailRecipientFilters = (frame) => {
     }
 };
 
-const transformPostVisibilityFilters = (frame) => {
-    if (frame.data.posts[0].visibility === 'filter' && frame.data.posts[0].visibility_filter) {
-        frame.data.posts[0].visibility = frame.data.posts[0].visibility_filter;
-    }
-    delete frame.data.posts[0].visibility_filter;
-};
-
 module.exports = {
     browse(apiConfig, frame) {
         debug('browse');
@@ -212,7 +205,6 @@ module.exports = {
             });
         }
 
-        transformPostVisibilityFilters(frame);
         transformLegacyEmailRecipientFilters(frame);
         handlePostsMeta(frame);
         defaultFormat(frame);

package/core/server/api/canary/utils/serializers/output/email-posts.js

@@ -2,8 +2,8 @@ const mapper = require('./utils/mapper');
 const gating = require('./utils/post-gating');
 
 module.exports = {
-    read(model, apiConfig, frame) {
-        const emailPost = mapper.mapPost(model, frame);
+    async read(model, apiConfig, frame) {
+        const emailPost = await mapper.mapPost(model, frame);
         gating.forPost(emailPost, frame);
 
         frame.response = {

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

@@ -2,25 +2,29 @@ const debug = require('@tryghost/debug')('api:canary:utils:serializers:output:pa
 const mapper = require('./utils/mapper');
 
 module.exports = {
-    all(models, apiConfig, frame) {
+    async all(models, apiConfig, frame) {
         debug('all');
 
         // CASE: e.g. destroy returns null
         if (!models) {
             return;
         }
-
+        let pages = [];
         if (models.meta) {
+            for (let model of models.data) {
+                let page = await mapper.mapPage(model, frame);
+                pages.push(page);
+            }
             frame.response = {
-                pages: models.data.map(model => mapper.mapPage(model, frame)),
+                pages,
                 meta: models.meta
             };
 
             return;
         }
-
+        let page = await mapper.mapPage(models, frame);
         frame.response = {
-            pages: [mapper.mapPage(models, frame)]
+            pages: [page]
         };
     }
 };

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

@@ -2,25 +2,29 @@ const debug = require('@tryghost/debug')('api:canary:utils:serializers:output:po
 const mapper = require('./utils/mapper');
 
 module.exports = {
-    all(models, apiConfig, frame) {
+    async all(models, apiConfig, frame) {
         debug('all');
 
         // CASE: e.g. destroy returns null
         if (!models) {
             return;
         }
-
+        let posts = [];
         if (models.meta) {
+            for (let model of models.data) {
+                let post = await mapper.mapPost(model, frame);
+                posts.push(post);
+            }
             frame.response = {
-                posts: models.data.map(model => mapper.mapPost(model, frame)),
+                posts,
                 meta: models.meta
             };
 
             return;
         }
-
+        let post = await mapper.mapPost(models, frame);
         frame.response = {
-            posts: [mapper.mapPost(models, frame)]
+            posts: [post]
         };
     }
 };

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

@@ -1,9 +1,10 @@
 const mapper = require('./utils/mapper');
 
 module.exports = {
-    all(model, apiConfig, frame) {
+    async all(model, apiConfig, frame) {
+        const data = await mapper.mapPost(model, frame);
         frame.response = {
-            preview: [mapper.mapPost(model, frame)]
+            preview: [data]
         };
         frame.response.preview[0].page = model.get('type') === 'page';
     }

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

@@ -75,6 +75,7 @@ function serializeProduct(product, options, apiType) {
         slug: json.slug,
         active: json.active,
         type: json.type,
+        welcome_page_url: json.welcome_page_url,
         created_at: json.created_at,
         updated_at: json.updated_at,
         stripe_prices: json.stripePrices ? json.stripePrices.map(price => serializeStripePrice(price, hideStripeData)) : null,
@@ -164,6 +165,7 @@ function createSerializer(debugString, serialize) {
  * @prop {string} description
  * @prop {boolean} active
  * @prop {string} type
+ * @prop {string} welcome_page_url
  * @prop {Date} created_at
  * @prop {Date} updated_at
  * @prop {StripePrice[]} [stripe_prices]

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

@@ -1,6 +1,5 @@
 const _ = require('lodash');
 const localUtils = require('../../../index');
-const labsService = require('../../../../../../../shared/labs');
 
 const tag = (attrs, frame) => {
     if (localUtils.isContentAPI(frame)) {
@@ -122,14 +121,6 @@ const post = (attrs, frame) => {
         delete attrs.primary_author;
     }
 
-    // Handles visibility filter for multiple products
-    if (attrs.visibility && labsService.isSet('multipleProducts')) {
-        if (!['members', 'public', 'paid'].includes(attrs.visibility)) {
-            attrs.visibility_filter = attrs.visibility;
-            attrs.visibility = 'filter';
-        }
-    }
-
     delete attrs.locale;
     delete attrs.author;
     delete attrs.type;

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

@@ -7,6 +7,10 @@ const clean = require('./clean');
 const extraAttrs = require('./extra-attrs');
 const postsMetaSchema = require('../../../../../../data/schema').tables.posts_meta;
 const mega = require('../../../../../../services/mega');
+const labsService = require('../../../../../../../shared/labs');
+
+const getPostServiceInstance = require('../../../../../../services/posts/posts-service');
+const postsService = getPostServiceInstance('canary');
 
 const mapUser = (model, frame) => {
     const jsonModel = model.toJSON ? model.toJSON(frame.options) : model;
@@ -27,7 +31,7 @@ const mapTag = (model, frame) => {
     return jsonModel;
 };
 
-const mapPost = (model, frame) => {
+const mapPost = async (model, frame) => {
     const extendedOptions = Object.assign(_.cloneDeep(frame.options), {
         extraProperties: ['canonical_url']
     });
@@ -38,6 +42,17 @@ const mapPost = (model, frame) => {
 
     extraAttrs.forPost(frame, model, jsonModel);
 
+    // Attach tiers to custom nql visibility filter
+    if (labsService.isSet('multipleProducts')
+        && jsonModel.visibility
+        && !['members', 'public', 'paid', 'tiers'].includes(jsonModel.visibility)
+    ) {
+        const tiers = await postsService.getProductsFromVisibilityFilter(jsonModel.visibility);
+
+        jsonModel.visibility = 'tiers';
+        jsonModel.tiers = tiers;
+    }
+
     if (utils.isContentAPI(frame)) {
         // Content api v2 still expects page prop
         if (jsonModel.type === 'page') {
@@ -88,8 +103,8 @@ const mapPost = (model, frame) => {
     return jsonModel;
 };
 
-const mapPage = (model, frame) => {
-    const jsonModel = mapPost(model, frame);
+const mapPage = async (model, frame) => {
+    const jsonModel = await mapPost(model, frame);
 
     delete jsonModel.email_subject;
     delete jsonModel.email_recipient_filter;

package/core/server/api/canary/utils/validators/input/pages.js

@@ -16,7 +16,7 @@ const validateVisibility = async function (frame) {
     const visibility = frame.data.pages[0].visibility;
     const visibilityFilter = frame.data.pages[0].visibility_filter;
     if (visibility) {
-        if (!['public', 'members', 'paid'].includes(visibility)) {
+        if (!['public', 'members', 'paid', 'tiers'].includes(visibility)) {
             // check filter is valid
             try {
                 await models.Member.findPage({filter: visibilityFilter, limit: 1});

package/core/server/api/canary/utils/validators/input/posts.js

@@ -16,7 +16,7 @@ const validateVisibility = async function (frame) {
     const visibility = frame.data.posts[0].visibility;
     const visibilityFilter = frame.data.posts[0].visibility_filter;
     if (visibility) {
-        if (!['public', 'members', 'paid'].includes(visibility)) {
+        if (!['public', 'members', 'paid', 'tiers'].includes(visibility)) {
             // check filter is valid
             try {
                 await models.Member.findPage({filter: visibilityFilter, limit: 1});

package/core/server/data/exporter/table-lists.js

@@ -10,6 +10,7 @@ const BACKUP_TABLES = [
     'members',
     'members_labels',
     'members_products',
+    'posts_products',
     'members_stripe_customers',
     'members_stripe_customers_subscriptions',
     'migrations',

package/core/server/data/migrations/versions/4.35/2022-01-20-05-55-add-post-products-table.js

@@ -0,0 +1,8 @@
+const {addTable} = require('../../utils');
+
+module.exports = addTable('posts_products', {
+    id: {type: 'string', maxlength: 24, nullable: false, primary: true},
+    post_id: {type: 'string', maxlength: 24, nullable: false, references: 'posts.id', cascadeDelete: true},
+    product_id: {type: 'string', maxlength: 24, nullable: false, references: 'products.id', cascadeDelete: true},
+    sort_order: {type: 'integer', nullable: false, unsigned: true, defaultTo: 0}
+});

package/core/server/data/migrations/versions/4.35/2022-01-30-15-17-set-welcome-page-url-from-settings.js

@@ -0,0 +1,45 @@
+const logging = require('@tryghost/logging');
+
+// For DML - data changes
+const {createTransactionalMigration} = require('../../utils');
+
+module.exports = createTransactionalMigration(
+    async function up(knex) {
+        logging.info('Setting welcome_page_url from settings');
+
+        const paidSignupRedirect = await knex('settings')
+            .select('value')
+            .where('key', 'members_paid_signup_redirect')
+            .first();
+
+        const freeSignupRedirect = await knex('settings')
+            .select('value')
+            .where('key', 'members_free_signup_redirect')
+            .first();
+
+        if (paidSignupRedirect) {
+            logging.info(`Setting paid Tiers welcome_page_url to ${paidSignupRedirect.value}`);
+
+            await knex('products')
+                .update('welcome_page_url', paidSignupRedirect.value)
+                .where('type', 'paid');
+        } else {
+            logging.info(`No members_paid_signup_redirect setting found`);
+        }
+
+        if (freeSignupRedirect) {
+            logging.info(`Setting free Tiers welcome_page_url to ${freeSignupRedirect.value}`);
+
+            await knex('products')
+                .update('welcome_page_url', freeSignupRedirect.value)
+                .where('type', 'free');
+        } else {
+            logging.info(`No members_free_signup_redirect setting found`);
+        }
+    },
+    async function down(knex) {
+        logging.info('Setting welcome_page_url to NULL');
+        await knex('products')
+            .update('welcome_page_url', null);
+    }
+);

package/core/server/data/migrations/versions/4.35/2022-02-01-11-48-update-email-recipient-filter-column-type.js

@@ -0,0 +1,18 @@
+const logging = require('@tryghost/logging');
+const {createNonTransactionalMigration} = require('../../utils');
+
+module.exports = createNonTransactionalMigration(
+    async function up(knex) {
+        if (knex.client.config.client === 'sqlite3') {
+            logging.warn('Skipping migration for SQLite3');
+            return;
+        }
+        logging.info('Changing posts.email_recipient_filter column from VARCHAR(50) to TEXT');
+        await knex.schema.alterTable('posts', function (table) {
+            table.text('email_recipient_filter').alter();
+        });
+    },
+    async function down() {
+        logging.warn('Not changing posts.email_recipient_filter column');
+    }
+);

package/core/server/data/migrations/versions/4.35/2022-02-01-12-03-update-recipient-filter-column-type.js

@@ -0,0 +1,18 @@
+const logging = require('@tryghost/logging');
+const {createNonTransactionalMigration} = require('../../utils');
+
+module.exports = createNonTransactionalMigration(
+    async function up(knex) {
+        if (knex.client.config.client === 'sqlite3') {
+            logging.warn('Skipping migration for SQLite3');
+            return;
+        }
+        logging.info('Changing emails.recipient_filter column from VARCHAR(50) to TEXT');
+        await knex.schema.alterTable('emails', function (table) {
+            table.text('recipient_filter').alter();
+        });
+    },
+    async function down() {
+        logging.warn('Not changing emails.recipient_filter column');
+    }
+);

package/core/server/data/migrations/versions/4.35/2022-02-02-10-38-add-default-content-visibility-tiers-setting.js

@@ -0,0 +1,8 @@
+const {addSetting} = require('../../utils.js');
+
+module.exports = addSetting({
+    key: 'default_content_visibility_tiers',
+    value: '[]',
+    type: 'array',
+    group: 'members'
+});