ghost 5.14.2 → 5.15.0

package/core/frontend/web/site.js

@@ -14,7 +14,8 @@ const themeEngine = require('../services/theme-engine');
 const themeMiddleware = themeEngine.middleware;
 const membersService = require('../../server/services/members');
 const offersService = require('../../server/services/offers');
-const customRedirects = require('../../server/services/redirects');
+const customRedirects = require('../../server/services/custom-redirects');
+const linkRedirects = require('../../server/services/link-redirection');
 const siteRoutes = require('./routes');
 const shared = require('../../server/web/shared');
 const errorHandler = require('@tryghost/mw-error-handler');
@@ -49,6 +50,8 @@ module.exports = function setupSiteApp(routerConfig) {
 
     siteApp.use(offersService.middleware);
 
+    siteApp.use(linkRedirects.service.handleRequest);
+
     // you can extend Ghost with a custom redirects file
     // see https://github.com/TryGhost/Ghost/issues/7707
     siteApp.use(customRedirects.middleware);
@@ -78,11 +81,11 @@ module.exports = function setupSiteApp(routerConfig) {
     // Member attribution
     siteApp.use(mw.servePublicFile('built', 'public/member-attribution.min.js', 'application/javascript', constants.ONE_YEAR_S));
 
-    // Serve blog images using the storage adapter
+    // Serve site images using the storage adapter
     siteApp.use(STATIC_IMAGE_URL_PREFIX, mw.handleImageSizes, storage.getStorage('images').serve());
-    // Serve blog media using the storage adapter
+    // Serve site media using the storage adapter
     siteApp.use(STATIC_MEDIA_URL_PREFIX, storage.getStorage('media').serve());
-    // Serve blog files using the storage adapter
+    // Serve site files using the storage adapter
     siteApp.use(STATIC_FILES_URL_PREFIX, storage.getStorage('files').serve());
 
     // Global handling for member session, ensures a member is logged in to the frontend
@@ -91,7 +94,7 @@ module.exports = function setupSiteApp(routerConfig) {
     // /member/.well-known/* serves files (e.g. jwks.json) so it needs to be mounted before the prettyUrl mw to avoid trailing slashes
     siteApp.use(
         '/members/.well-known',
-        shared.middleware.cacheControl('public', {maxAge: 60 * 60 * 24}),
+        shared.middleware.cacheControl('public', {maxAge: constants.ONE_DAY_S}),
         (req, res, next) => membersService.api.middleware.wellKnown(req, res, next)
     );
 
@@ -127,7 +130,7 @@ module.exports = function setupSiteApp(routerConfig) {
 
     // ### Caching
     siteApp.use(function (req, res, next) {
-        // Site frontend is cacheable UNLESS request made by a member or blog is in private mode
+        // Site frontend is cacheable UNLESS request made by a member or site is in private mode
         if (req.member || res.isPrivateBlog) {
             return shared.middleware.cacheControl('private')(req, res, next);
         } else {
@@ -148,7 +151,7 @@ module.exports = function setupSiteApp(routerConfig) {
     router = siteRoutes(routerConfig);
     Object.setPrototypeOf(SiteRouter, router);
 
-    // Set up Frontend routes (including private blogging routes)
+    // Set up Frontend routes (including private site routes)
     siteApp.use(SiteRouter);
 
     // ### Error handlers

package/core/server/api/endpoints/redirects.js

@@ -1,6 +1,6 @@
 const path = require('path');
 
-const redirects = require('../../services/redirects');
+const customRedirects = require('../../services/custom-redirects');
 
 module.exports = {
     docName: 'redirects',
@@ -10,11 +10,9 @@ module.exports = {
             disposition: {
                 type: 'file',
                 value() {
-                    return redirects.api.getRedirectsFilePath()
+                    return customRedirects.api.getRedirectsFilePath()
                         .then((filePath) => {
-                            // TODO: Default file type is .json for backward compatibility.
-                            // When .yaml becomes default or .json is removed at v4,
-                            // This part should be changed.
+                            // @deprecated: .json was deprecated in v4.0 but is still the default for backwards compat
                             return filePath === null || path.extname(filePath) === '.json'
                                 ? 'redirects.json'
                                 : 'redirects.yaml';
@@ -25,13 +23,13 @@ module.exports = {
         permissions: true,
         response: {
             async format() {
-                const filePath = await redirects.api.getRedirectsFilePath();
+                const filePath = await customRedirects.api.getRedirectsFilePath();
 
                 return filePath === null || path.extname(filePath) === '.json' ? 'json' : 'plain';
             }
         },
         query() {
-            return redirects.api.get();
+            return customRedirects.api.get();
         }
     },
 
@@ -41,7 +39,7 @@ module.exports = {
             cacheInvalidate: true
         },
         query(frame) {
-            return redirects.api.setFromFilePath(frame.file.path, frame.file.ext);
+            return customRedirects.api.setFromFilePath(frame.file.path, frame.file.ext);
         }
     }
 };

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

@@ -93,22 +93,8 @@ module.exports = {
 
         // CASE: Content API access
         if (frame.options.context.public && frame.apiType !== 'comments') {
-            debug('check content permissions');
-
-            // @TODO: Remove when we drop v0.1
-            // @TODO: https://github.com/TryGhost/Ghost/issues/10733
-            return permissions.applyPublicRules(apiConfig.docName, apiConfig.method, {
-                status: frame.options.status,
-                id: frame.options.id,
-                uuid: frame.options.uuid,
-                slug: frame.options.slug,
-                data: {
-                    status: frame.data.status,
-                    id: frame.data.id,
-                    uuid: frame.data.uuid,
-                    slug: frame.data.slug
-                }
-            });
+            debug('content api permissions pass-through');
+            return Promise.resolve(frame.options);
         }
 
         return nonePublicAuth(apiConfig, frame);

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

@@ -7,10 +7,10 @@ const localUtils = require('../../index');
 const postsMetaSchema = require('../../../../../data/schema').tables.posts_meta;
 const clean = require('./utils/clean');
 
-function removeMobiledocFormat(frame) {
-    if (frame.options.formats && frame.options.formats.includes('mobiledoc')) {
+function removeSourceFormats(frame) {
+    if (frame.options.formats?.includes('mobiledoc') || frame.options.formats?.includes('lexical')) {
         frame.options.formats = frame.options.formats.filter((format) => {
-            return (format !== 'mobiledoc');
+            return !['mobiledoc', 'lexical'].includes(format);
         });
     }
 }
@@ -95,7 +95,7 @@ module.exports = {
         forcePageFilter(frame);
 
         if (localUtils.isContentAPI(frame)) {
-            removeMobiledocFormat(frame);
+            removeSourceFormats(frame);
             setDefaultOrder(frame);
             forceVisibilityColumn(frame);
         }
@@ -113,7 +113,7 @@ module.exports = {
         forcePageFilter(frame);
 
         if (localUtils.isContentAPI(frame)) {
-            removeMobiledocFormat(frame);
+            removeSourceFormats(frame);
             setDefaultOrder(frame);
             forceVisibilityColumn(frame);
         }

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

@@ -7,10 +7,10 @@ const mobiledoc = require('../../../../../lib/mobiledoc');
 const postsMetaSchema = require('../../../../../data/schema').tables.posts_meta;
 const clean = require('./utils/clean');
 
-function removeMobiledocFormat(frame) {
-    if (frame.options.formats && frame.options.formats.includes('mobiledoc')) {
+function removeSourceFormats(frame) {
+    if (frame.options.formats?.includes('mobiledoc') || frame.options.formats?.includes('lexical')) {
         frame.options.formats = frame.options.formats.filter((format) => {
-            return (format !== 'mobiledoc');
+            return !['mobiledoc', 'lexical'].includes(format);
         });
     }
 }
@@ -101,8 +101,8 @@ module.exports = {
          * - user exists? admin api access
          */
         if (localUtils.isContentAPI(frame)) {
-            // CASE: the content api endpoint for posts should not return mobiledoc
-            removeMobiledocFormat(frame);
+            // CASE: the content api endpoint for posts should not return mobiledoc or lexical
+            removeSourceFormats(frame);
 
             setDefaultOrder(frame);
             forceVisibilityColumn(frame);
@@ -127,8 +127,8 @@ module.exports = {
          * - user exists? admin api access
          */
         if (localUtils.isContentAPI(frame)) {
-            // CASE: the content api endpoint for posts should not return mobiledoc
-            removeMobiledocFormat(frame);
+            // CASE: the content api endpoint for posts should not return mobiledoc or lexical
+            removeSourceFormats(frame);
 
             setDefaultOrder(frame);
             forceVisibilityColumn(frame);

package/core/server/api/endpoints/utils/serializers/input/settings.js

@@ -47,6 +47,7 @@ const EDITABLE_SETTINGS = [
     'mailgun_domain',
     'mailgun_base_url',
     'email_track_opens',
+    'email_track_clicks',
     'amp',
     'amp_gtag_id',
     'slack_url',

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

@@ -4,7 +4,8 @@ const {ValidationError} = require('@tryghost/errors');
 const tpl = require('@tryghost/tpl');
 
 const messages = {
-    invalidVisibilityFilter: 'Invalid filter in visibility_filter property'
+    invalidVisibilityFilter: 'Invalid filter in visibility_filter property',
+    onlySingleContentSource: 'It\'s only possible to save mobiledoc or lexical properties, not both'
 };
 
 const validateVisibility = async function (frame) {
@@ -33,15 +34,29 @@ const validateVisibility = async function (frame) {
     }
 };
 
+const validateSingleContentSource = async function (frame) {
+    if (!frame.data.pages?.[0]) {
+        return;
+    }
+
+    const [page] = frame.data.pages;
+    if (page.mobiledoc && page.lexical) {
+        return Promise.reject(new ValidationError({
+            message: tpl(messages.onlySingleContentSource),
+            property: 'lexical'
+        }));
+    }
+};
+
 module.exports = {
-    add(apiConfig, frame) {
-        return jsonSchema.validate(...arguments).then(() => {
-            return validateVisibility(frame);
-        });
+    async add(apiConfig, frame) {
+        await jsonSchema.validate(...arguments);
+        await validateVisibility(frame);
+        await validateSingleContentSource(frame);
     },
-    edit(apiConfig, frame) {
-        return jsonSchema.validate(...arguments).then(() => {
-            return validateVisibility(frame);
-        });
+    async edit(apiConfig, frame) {
+        await jsonSchema.validate(...arguments);
+        await validateVisibility(frame);
+        await validateSingleContentSource(frame);
     }
 };

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

@@ -4,7 +4,8 @@ const {ValidationError} = require('@tryghost/errors');
 const tpl = require('@tryghost/tpl');
 
 const messages = {
-    invalidVisibilityFilter: 'Invalid filter in visibility_filter property'
+    invalidVisibilityFilter: 'Invalid filter in visibility_filter property',
+    onlySingleContentSource: 'It\'s only possible to save mobiledoc or lexical properties, not both'
 };
 
 const validateVisibility = async function (frame) {
@@ -33,15 +34,29 @@ const validateVisibility = async function (frame) {
     }
 };
 
+const validateSingleContentSource = async function (frame) {
+    if (!frame.data.posts?.[0]) {
+        return;
+    }
+
+    const [post] = frame.data.posts;
+    if (post.mobiledoc && post.lexical) {
+        return Promise.reject(new ValidationError({
+            message: tpl(messages.onlySingleContentSource),
+            property: 'lexical'
+        }));
+    }
+};
+
 module.exports = {
-    add(apiConfig, frame) {
-        return jsonSchema.validate(...arguments).then(() => {
-            return validateVisibility(frame);
-        });
+    async add(apiConfig, frame) {
+        await jsonSchema.validate(...arguments);
+        await validateVisibility(frame);
+        await validateSingleContentSource(frame);
     },
-    edit(apiConfig, frame) {
-        return jsonSchema.validate(...arguments).then(() => {
-            return validateVisibility(frame);
-        });
+    async edit(apiConfig, frame) {
+        await jsonSchema.validate(...arguments);
+        await validateVisibility(frame);
+        await validateSingleContentSource(frame);
     }
 };

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

@@ -21,6 +21,7 @@ const BACKUP_TABLES = [
     'tokens',
     'sessions',
     'mobiledoc_revisions',
+    'post_revisions',
     'email_batches',
     'email_recipients',
     'members_cancel_events',

package/core/server/data/migrations/utils/settings.js

@@ -32,9 +32,7 @@ function addSetting({key, value, type, group}) {
                     group,
                     type,
                     created_at: now,
-                    created_by: MIGRATION_USER,
-                    updated_at: now,
-                    updated_by: MIGRATION_USER
+                    created_by: MIGRATION_USER
                 });
         },
         async function down(connection) {

package/core/server/data/migrations/versions/5.15/2022-09-12-16-10-add-posts-lexical-column.js

@@ -0,0 +1,8 @@
+const {createAddColumnMigration} = require('../../utils');
+
+module.exports = createAddColumnMigration('posts', 'lexical', {
+    type: 'text',
+    maxlength: 1000000000,
+    fieldtype: 'long',
+    nullable: true
+});

package/core/server/data/migrations/versions/5.15/2022-09-14-12-46-add-email-track-clicks-setting.js

@@ -0,0 +1,8 @@
+const {addSetting} = require('../../utils');
+
+module.exports = addSetting({
+    key: 'email_track_clicks',
+    value: 'true',
+    type: 'boolean',
+    group: 'email'
+});

package/core/server/data/migrations/versions/5.15/2022-09-16-08-22-add-post-revisions-table.js

@@ -0,0 +1,9 @@
+const {addTable} = require('../../utils');
+
+module.exports = addTable('post_revisions', {
+    id: {type: 'string', maxlength: 24, nullable: false, primary: true},
+    post_id: {type: 'string', maxlength: 24, nullable: false, index: true},
+    lexical: {type: 'text', maxlength: 1000000000, fieldtype: 'long', nullable: true},
+    created_at_ts: {type: 'bigInteger', nullable: false},
+    created_at: {type: 'dateTime', nullable: false}
+});

package/core/server/data/schema/default-settings/default-settings.json

@@ -360,6 +360,14 @@
             },
             "type": "boolean"
         },
+        "email_track_clicks": {
+            "defaultValue": "true",
+            "validations": {
+                "isEmpty": false,
+                "isIn": [["true", "false"]]
+            },
+            "type": "boolean"
+        },
         "email_verification_required": {
             "defaultValue": "false",
             "validations": {

package/core/server/data/schema/schema.js

@@ -45,6 +45,7 @@ module.exports = {
         title: {type: 'string', maxlength: 2000, nullable: false, validations: {isLength: {max: 255}}},
         slug: {type: 'string', maxlength: 191, nullable: false},
         mobiledoc: {type: 'text', maxlength: 1000000000, fieldtype: 'long', nullable: true},
+        lexical: {type: 'text', maxlength: 1000000000, fieldtype: 'long', nullable: true},
         html: {type: 'text', maxlength: 1000000000, fieldtype: 'long', nullable: true},
         comment_id: {type: 'string', maxlength: 50, nullable: true},
         plaintext: {type: 'text', maxlength: 1000000000, fieldtype: 'long', nullable: true},
@@ -386,6 +387,13 @@ module.exports = {
         created_at_ts: {type: 'bigInteger', nullable: false},
         created_at: {type: 'dateTime', nullable: false}
     },
+    post_revisions: {
+        id: {type: 'string', maxlength: 24, nullable: false, primary: true},
+        post_id: {type: 'string', maxlength: 24, nullable: false, index: true},
+        lexical: {type: 'text', maxlength: 1000000000, fieldtype: 'long', nullable: true},
+        created_at_ts: {type: 'bigInteger', nullable: false},
+        created_at: {type: 'dateTime', nullable: false}
+    },
     members: {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},
         uuid: {type: 'string', maxlength: 36, nullable: true, unique: true, validations: {isUUID: true}},

package/core/server/lib/lexical.js

@@ -0,0 +1,12 @@
+let lexicalHtmlRenderer;
+
+module.exports = {
+    get lexicalHtmlRenderer() {
+        if (!lexicalHtmlRenderer) {
+            const LexicalHtmlRenderer = require('@tryghost/kg-lexical-html-renderer');
+            lexicalHtmlRenderer = new LexicalHtmlRenderer();
+        }
+
+        return lexicalHtmlRenderer;
+    }
+};

package/core/server/models/base/plugins/user-type.js

@@ -39,13 +39,11 @@ module.exports = function (Bookshelf) {
             /**
              * @NOTE:
              *
-             * This is a dirty hotfix for v0.1 only.
-             * The `x_by` columns are getting deprecated soon (https://github.com/TryGhost/Ghost/issues/10286).
+             * This is a dirty fix until we get rid of all the x_by columns
+             * @deprecated x_by columns are deprecated as of v1.0 - instead we should use the actions table
+             * see https://github.com/TryGhost/Ghost/issues/10286.
              *
-             * We return the owner ID '1' in case an integration updates or creates
-             * resources. v0.1 will continue to use the `x_by` columns. v0.1 does not support integrations.
-             * API v2 will introduce a new feature to solve inserting/updating resources
-             * from users or integrations. API v2 won't expose `x_by` columns anymore.
+             * We return the owner ID '1' in case an integration updates or creates resources.
              *
              * ---
              *

package/core/server/models/post-revision.js

@@ -0,0 +1,35 @@
+const ghostBookshelf = require('./base');
+
+const PostRevision = ghostBookshelf.Model.extend({
+    tableName: 'post_revisions'
+}, {
+    permittedOptions(methodName) {
+        let options = ghostBookshelf.Model.permittedOptions.call(this, methodName);
+        const validOptions = {
+            findAll: ['filter', 'columns']
+        };
+
+        if (validOptions[methodName]) {
+            options = options.concat(validOptions[methodName]);
+        }
+
+        return options;
+    },
+
+    orderDefaultRaw() {
+        return 'created_at_ts DESC';
+    },
+
+    toJSON(unfilteredOptions) {
+        const options = PostRevision.filterOptions(unfilteredOptions, 'toJSON');
+        const attrs = ghostBookshelf.Model.prototype.toJSON.call(this, options);
+
+        // CASE: only for internal accuracy
+        delete attrs.created_at_ts;
+        return attrs;
+    }
+});
+
+module.exports = {
+    PostRevision: ghostBookshelf.model('PostRevision', PostRevision)
+};

package/core/server/models/post.js

@@ -13,6 +13,7 @@ const config = require('../../shared/config');
 const settingsCache = require('../../shared/settings-cache');
 const limitService = require('../services/limits');
 const mobiledocLib = require('../lib/mobiledoc');
+const lexicalLib = require('../lib/lexical');
 const relations = require('./relations');
 const urlUtils = require('../../shared/url-utils');
 const {Tag} = require('./tag');
@@ -29,6 +30,7 @@ const messages = {
 };
 
 const MOBILEDOC_REVISIONS_COUNT = 10;
+const POST_REVISIONS_COUNT = 10;
 const ALL_STATUSES = ['published', 'draft', 'scheduled', 'sent'];
 
 let Post;
@@ -90,7 +92,7 @@ Post = ghostBookshelf.Model.extend({
         };
     },
 
-    relationships: ['tags', 'authors', 'mobiledoc_revisions', 'posts_meta', 'tiers'],
+    relationships: ['tags', 'authors', 'mobiledoc_revisions', 'post_revisions', 'posts_meta', 'tiers'],
 
     // NOTE: look up object, not super nice, but was easy to implement
     relationshipBelongsTo: {
@@ -596,7 +598,7 @@ Post = ghostBookshelf.Model.extend({
             });
         }
 
-        if (!this.get('mobiledoc')) {
+        if (!this.get('mobiledoc') && !this.get('lexical')) {
             this.set('mobiledoc', JSON.stringify(mobiledocLib.blankDocument));
         }
 
@@ -610,9 +612,12 @@ Post = ghostBookshelf.Model.extend({
         // CASE: ?force_rerender=true passed via Admin API
         // CASE: html is null, but mobiledoc exists (only important for migrations & importing)
         if (
-            this.hasChanged('mobiledoc')
-            || options.force_rerender
-            || (!this.get('html') && (options.migrating || options.importing))
+            !this.get('lexical') &&
+            (
+                this.hasChanged('mobiledoc')
+                || options.force_rerender
+                || (!this.get('html') && (options.migrating || options.importing))
+            )
         ) {
             try {
                 this.set('html', mobiledocLib.mobiledocHtmlRenderer.render(JSON.parse(this.get('mobiledoc'))));
@@ -624,6 +629,28 @@ Post = ghostBookshelf.Model.extend({
             }
         }
 
+        // CASE: lexical has changed, generate html
+        // CASE: ?force_rerender=true passed via Admin API
+        // CASE: html is null, but lexical exists (only important for migrations & importing)
+        if (
+            !this.get('mobiledoc') &&
+            (
+                this.hasChanged('lexical')
+                || options.force_rerender
+                || (!this.get('html') && (options.migrating || options.importing))
+            )
+        ) {
+            try {
+                this.set('html', lexicalLib.lexicalHtmlRenderer.render(this.get('lexical')));
+            } catch (err) {
+                throw new errors.ValidationError({
+                    message: 'Invalid lexical structure.',
+                    help: 'https://ghost.org/docs/publishing/',
+                    property: 'lexical'
+                });
+            }
+        }
+
         if (this.hasChanged('html') || !this.get('plaintext')) {
             let plaintext;
 
@@ -750,7 +777,7 @@ Post = ghostBookshelf.Model.extend({
         }
 
         // CASE: Handle mobiledoc backups/revisions. This is a pure database feature.
-        if (model.hasChanged('mobiledoc') && !options.importing && !options.migrating) {
+        if (model.hasChanged('mobiledoc') && !model.get('lexical') && !options.importing && !options.migrating) {
             ops.push(function updateRevisions() {
                 return ghostBookshelf.model('MobiledocRevision')
                     .findAll(Object.assign({
@@ -794,6 +821,39 @@ Post = ghostBookshelf.Model.extend({
             });
         }
 
+        // CASE: Handle post backups/revisions. This is a pure database feature.
+        if (model.hasChanged('lexical') && !model.get('mobiledoc') && !options.importing && !options.migrating) {
+            ops.push(function updateRevisions() {
+                return ghostBookshelf.model('PostRevision')
+                    .findAll(Object.assign({
+                        filter: `post_id:${model.id}`,
+                        columns: ['id']
+                    }, _.pick(options, 'transacting')))
+                    .then((revisions) => {
+                        // Store previous + latest lexical content
+                        if (!revisions.length && options.method !== 'insert') {
+                            model.set('post_revisions', [{
+                                post_id: model.id,
+                                lexical: model.previous('lexical'),
+                                created_at_ts: Date.now() - 1
+                            }, {
+                                post_id: model.id,
+                                lexical: model.get('lexical'),
+                                created_at_ts: Date.now()
+                            }]);
+                        } else {
+                            const revisionsJSON = revisions.toJSON().slice(0, POST_REVISIONS_COUNT - 1);
+
+                            model.set('post_revisions', revisionsJSON.concat([{
+                                post_id: model.id,
+                                lexical: model.get('lexical'),
+                                created_at_ts: Date.now()
+                            }]));
+                        }
+                    });
+            });
+        }
+
         if (this.get('tiers')) {
             this.set('tiers', this.get('tiers').map(t => ({
                 id: t.id
@@ -831,6 +891,10 @@ Post = ghostBookshelf.Model.extend({
         return this.hasMany('MobiledocRevision', 'post_id');
     },
 
+    post_revisions() {
+        return this.hasMany('PostRevision', 'post_id');
+    },
+
     posts_meta: function postsMeta() {
         return this.hasOne('PostsMeta', 'post_id');
     },
@@ -901,6 +965,7 @@ Post = ghostBookshelf.Model.extend({
 
         // CASE: never expose the revisions
         delete attrs.mobiledoc_revisions;
+        delete attrs.post_revisions;
 
         // If the current column settings allow it...
         if (!options.columns || (options.columns && options.columns.indexOf('primary_tag') > -1)) {
@@ -974,7 +1039,7 @@ Post = ghostBookshelf.Model.extend({
         return filter;
     }
 }, {
-    allowedFormats: ['mobiledoc', 'html', 'plaintext'],
+    allowedFormats: ['mobiledoc', 'lexical', 'html', 'plaintext'],
 
     orderDefaultOptions: function orderDefaultOptions() {
         return {

package/core/server/services/bulk-email/bulk-email-processor.js

@@ -7,7 +7,6 @@ const logging = require('@tryghost/logging');
 const models = require('../../models');
 const MailgunClient = require('@tryghost/mailgun-client');
 const sentry = require('../../../shared/sentry');
-const labs = require('../../../shared/labs');
 const debug = require('@tryghost/debug')('mega');
 const postEmailSerializer = require('../mega/post-email-serializer');
 const configService = require('../../../shared/config');
@@ -173,10 +172,8 @@ module.exports = {
             // Load newsletter data on email
             await emailBatchModel.relations.email.getLazyRelation('newsletter', {require: false, ...knexOptions});
 
-            if (labs.isSet('newsletterPaywall')) {
-                // Load post data on email - for content gating on paywall
-                await emailBatchModel.relations.email.getLazyRelation('post', {require: false, ...knexOptions});
-            }
+            // Load post data on email - for content gating on paywall
+            await emailBatchModel.relations.email.getLazyRelation('post', {require: false, ...knexOptions});
 
             // send the email
             const sendResponse = await this.send(emailBatchModel.relations.email.toJSON(), recipientRows, memberSegment);