ghost 5.20.0 → 5.21.0

package/core/server/data/migrations/versions/5.21/2022-10-26-04-50-member-subscription-created-batch-id.js

@@ -0,0 +1,72 @@
+const _ = require('lodash');
+const logging = require('@tryghost/logging');
+const ObjectId = require('bson-objectid').default;
+const {createTransactionalMigration} = require('../../utils');
+const DatabaseInfo = require('@tryghost/database-info');
+
+// This migration links together members_created_events and members_subscription_created_events
+
+module.exports = createTransactionalMigration(
+    async function up(knex) {
+        if (DatabaseInfo.isSQLite(knex)) {
+            logging.info('Skipped linking members_created_events and members_subscription_created_events on SQLite');
+            return;
+        }
+
+        // All events that happened within 15 minutes of each other will be linked
+        const rows = await knex('members_created_events as m')
+            .select('m.id as m_id', 's.id as s_id', 'm.member_id as member_id', 's.subscription_id as subscription_id')
+            .join('members_subscription_created_events AS s', 's.member_id', 'm.member_id')
+            .whereRaw('TIMESTAMPDIFF(MINUTE, s.created_at, m.created_at) between -15 and 15');
+
+        if (!rows.length) {
+            logging.info('Did not find linkable members_created_events and members_subscription_created_events');
+            return;
+        }
+
+        // Attach a unique id to each row
+        for (const row of rows) { // eslint-disable-line no-restricted-syntax
+            row.batch_id = ObjectId().toHexString();
+        }
+
+        // Create batches (insertBatch doesn't support the onConflict option)
+        const batches = _.chunk(rows, 1000);
+    
+        for (const batch of batches) { // eslint-disable-line no-restricted-syntax
+            // Update the members_created_events table using INSERT ON DUPLICATE KEY UPDATE trick
+            const response1 = await knex('members_created_events').insert(batch.map((r) => {
+                return {
+                    id: r.m_id,
+                    batch_id: r.batch_id,
+                    member_id: r.member_id, // added to make the insert work
+                    source: '', // added to make the insert work
+                    created_at: knex.raw('NOW()') // added to make the insert work
+                };
+            })).onConflict('id').merge(['batch_id']);
+
+            if (response1[0] !== 0) {
+                logging.error(`Inserted ${response1[0]} members_created_events, expected 0`);
+                throw new Error('Rolling back');
+            }
+
+            const response2 = await knex('members_subscription_created_events').insert(batch.map((r) => {
+                return {
+                    id: r.s_id,
+                    batch_id: r.batch_id,
+                    member_id: r.member_id, // added to make the insert work
+                    subscription_id: r.subscription_id, // added to make the insert work
+                    created_at: knex.raw('NOW()') // added to make the insert work
+                };
+            })).onConflict('id').merge(['batch_id']);
+
+            if (response2[0] !== 0) {
+                logging.error(`Inserted ${response1[0]} members_subscription_created_events, expected 0`);
+                throw new Error('Rolling back');
+            }
+        }
+        logging.info(`Linked ${rows.length} members_created_events and members_subscription_created_events`);
+    },
+    async function down() {
+        // noop
+    }
+);

package/core/server/data/migrations/versions/5.21/2022-10-26-09-32-add-feedback-enabled-column-to-emails.js

@@ -0,0 +1,7 @@
+const {createAddColumnMigration} = require('../../utils');
+
+module.exports = createAddColumnMigration('emails', 'feedback_enabled', {
+    type: 'boolean',
+    nullable: false,
+    defaultTo: false
+});

package/core/server/data/migrations/versions/5.21/2022-10-27-09-50-add-member-track-source-setting.js

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

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

@@ -295,6 +295,14 @@
         "members_yearly_price_id": {
             "defaultValue": null,
             "type": "string"
+        },
+        "members_track_sources": {
+            "defaultValue": "true",
+            "validations": {
+                "isEmpty": false,
+                "isIn": [["true", "false"]]
+            },
+            "type": "boolean"
         }
     },
     "portal": {

package/core/server/data/schema/fixtures/fixture-manager.js

@@ -1,5 +1,4 @@
 const _ = require('lodash');
-const Promise = require('bluebird');
 const logging = require('@tryghost/logging');
 const {sequence} = require('@tryghost/promise');
 
@@ -83,16 +82,16 @@ class FixtureManager {
         const userRolesRelation = this.fixtures.relations.find(r => r.from.relation === 'roles');
         await this.addFixturesForRelation(userRolesRelation, localOptions);
 
-        await Promise.mapSeries(this.fixtures.models.filter(m => !['User', 'Role'].includes(m.name)), (model) => {
+        await sequence(this.fixtures.models.filter(m => !['User', 'Role'].includes(m.name)).map(model => () => {
             logging.info('Model: ' + model.name);
 
             return this.addFixturesForModel(model, localOptions);
-        });
+        }));
 
-        await Promise.mapSeries(this.fixtures.relations.filter(r => r.from.relation !== 'roles'), (relation) => {
+        await sequence(this.fixtures.relations.filter(r => r.from.relation !== 'roles').map(relation => () => {
             logging.info('Relation: ' + relation.from.model + ' to ' + relation.to.model);
             return this.addFixturesForRelation(relation, localOptions);
-        });
+        }));
     }
 
     /*
@@ -191,12 +190,15 @@ class FixtureManager {
     fetchRelationData(relation, options) {
         const fromOptions = _.extend({}, options, {withRelated: [relation.from.relation]});
 
-        const props = {
-            from: models[relation.from.model].findAll(fromOptions),
-            to: models[relation.to.model].findAll(options)
-        };
+        const fromRelations = models[relation.from.model].findAll(fromOptions);
+        const toRelations = models[relation.to.model].findAll(options);
 
-        return Promise.props(props);
+        return Promise.all([fromRelations, toRelations]).then(([from, to]) => {
+            return {
+                from: from,
+                to: to
+            };
+        });
     }
 
     /**
@@ -223,7 +225,7 @@ class FixtureManager {
             });
         }
 
-        const results = await Promise.mapSeries(modelFixture.entries, async (entry) => {
+        const results = await sequence(modelFixture.entries.map(entry => async () => {
             let data = {};
 
             // CASE: if id is specified, only query by id
@@ -243,7 +245,7 @@ class FixtureManager {
             if (!found) {
                 return models[modelFixture.name].add(entry, options);
             }
-        });
+        }));
 
         return {expected: modelFixture.entries.length, done: _.compact(results).length};
     }
@@ -308,12 +310,12 @@ class FixtureManager {
     }
 
     async removeFixturesForModel(modelFixture, options) {
-        const results = await Promise.mapSeries(modelFixture.entries, async (entry) => {
+        const results = await sequence(modelFixture.entries.map(entry => async () => {
             const found = models[modelFixture.name].findOne(entry.id ? {id: entry.id} : entry, options);
             if (found) {
                 return models[modelFixture.name].destroy(_.extend(options, {id: found.id}));
             }
-        });
+        }));
 
         return {expected: modelFixture.entries.length, done: results.length};
     }

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

@@ -517,7 +517,8 @@ module.exports = {
             type: 'string', maxlength: 50, nullable: false, validations: {
                 isIn: [['member', 'import', 'system', 'api', 'admin']]
             }
-        }
+        },
+        batch_id: {type: 'string', maxlength: 24, nullable: true}
     },
     members_cancel_events: {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},
@@ -697,7 +698,8 @@ module.exports = {
         attribution_url: {type: 'string', maxlength: 2000, nullable: true},
         referrer_source: {type: 'string', maxlength: 191, nullable: true},
         referrer_medium: {type: 'string', maxlength: 191, nullable: true},
-        referrer_url: {type: 'string', maxlength: 2000, nullable: true}
+        referrer_url: {type: 'string', maxlength: 2000, nullable: true},
+        batch_id: {type: 'string', maxlength: 24, nullable: true}
     },
     offer_redemptions: {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},
@@ -783,6 +785,7 @@ module.exports = {
         plaintext: {type: 'text', maxlength: 1000000000, fieldtype: 'long', nullable: true},
         track_opens: {type: 'boolean', nullable: false, defaultTo: false},
         track_clicks: {type: 'boolean', nullable: false, defaultTo: false},
+        feedback_enabled: {type: 'boolean', nullable: false, defaultTo: false},
         submitted_at: {type: 'dateTime', nullable: false},
         newsletter_id: {type: 'string', maxlength: 24, nullable: true, references: 'newsletters.id'},
         created_at: {type: 'dateTime', nullable: false},

package/core/server/models/base/plugins/crud.js

@@ -108,6 +108,18 @@ module.exports = function (Bookshelf) {
                 options.order = this.orderDefaultOptions();
             }
 
+            if (options.selectRaw) {
+                itemCollection.query((qb) => {
+                    qb.select(qb.client.raw(options.selectRaw));
+                });
+            }
+
+            if (options.whereRaw) {
+                itemCollection.query((qb) => {
+                    qb.whereRaw(options.whereRaw);
+                });
+            }
+
             const response = await itemCollection.fetchPage(options);
             // Attributes are being filtered here, so they are not leaked into calling layer
             // where models are serialized to json and do not do more filtering.

package/core/server/models/email.js

@@ -11,6 +11,7 @@ const Email = ghostBookshelf.Model.extend({
             recipient_filter: 'status:-free',
             track_opens: false,
             track_clicks: false,
+            feedback_enabled: false,
             delivered_count: 0,
             opened_count: 0,
             failed_count: 0

package/core/server/models/member-click-event.js

@@ -42,6 +42,19 @@ const MemberClickEvent = ghostBookshelf.Model.extend({
 
     async destroy() {
         throw new errors.IncorrectUsageError({message: 'Cannot destroy MemberClickEvent'});
+    },
+
+    permittedOptions(methodName) {
+        let options = ghostBookshelf.Model.permittedOptions.call(this, methodName);
+        const validOptions = {
+            findPage: ['selectRaw', 'whereRaw']
+        };
+
+        if (validOptions[methodName]) {
+            options = options.concat(validOptions[methodName]);
+        }
+
+        return options;
     }
 });
 

package/core/server/models/member-created-event.js

@@ -8,6 +8,13 @@ const MemberCreatedEvent = ghostBookshelf.Model.extend({
         return this.belongsTo('Member', 'member_id', 'id');
     },
 
+    /**
+     * The subscription created event that happend at the same time (if any)
+     */
+    subscriptionCreatedEvent() {
+        return this.belongsTo('SubscriptionCreatedEvent', 'batch_id', 'batch_id');
+    },
+
     postAttribution() {
         return this.belongsTo('Post', 'attribution_id', 'id');   
     },
@@ -18,6 +25,22 @@ const MemberCreatedEvent = ghostBookshelf.Model.extend({
 
     tagAttribution() {
         return this.belongsTo('Tag', 'attribution_id', 'id');   
+    },
+    
+    filterRelations() {
+        return {
+            subscriptionCreatedEvent: {
+                // Mongo-knex doesn't support belongsTo relations
+                tableName: 'members_subscription_created_events',
+                tableNameAs: 'subscriptionCreatedEvent',
+                type: 'manyToMany',
+                joinTable: 'members_created_events',
+                joinFrom: 'id',
+                joinToForeign: 'batch_id',
+                joinTo: 'batch_id',
+                joinType: 'leftJoin'
+            }
+        };
     }
 }, {
     async edit() {

package/core/server/models/member-paid-subscription-event.js

@@ -8,6 +8,10 @@ const MemberPaidSubscriptionEvent = ghostBookshelf.Model.extend({
         return this.belongsTo('Member', 'member_id', 'id');
     },
 
+    stripeSubscription() {
+        return this.belongsTo('StripeCustomerSubscription', 'subscription_id', 'id');
+    },
+
     subscriptionCreatedEvent() {
         return this.belongsTo('SubscriptionCreatedEvent', 'subscription_id', 'subscription_id');
     },

package/core/server/models/member.js

@@ -114,6 +114,12 @@ const Member = ghostBookshelf.Model.extend({
                 joinTable: 'email_recipients',
                 joinFrom: 'member_id',
                 joinTo: 'email_id'
+            },
+            feedback: {
+                tableName: 'members_feedback',
+                tableNameAs: 'feedback',
+                type: 'oneToOne',
+                joinFrom: 'member_id'
             }
         };
     },

package/core/server/models/post.js

@@ -1399,7 +1399,7 @@ Post = ghostBookshelf.Model.extend({
                     qb.count('*')
                         .from('members_feedback')
                         .whereRaw('posts.id = members_feedback.post_id AND members_feedback.score = 0')
-                        .as('count__positive_feedback');
+                        .as('count__negative_feedback');
                 });
             },
             positive_feedback(modelOrCollection) {

package/core/server/models/subscription-created-event.js

@@ -8,6 +8,13 @@ const SubscriptionCreatedEvent = ghostBookshelf.Model.extend({
         return this.belongsTo('Member', 'member_id', 'id');
     },
 
+    /**
+     * The member created event that happend at the same time (if any)
+     */
+    memberCreatedEvent() {
+        return this.belongsTo('MemberCreatedEvent', 'batch_id', 'batch_id');
+    },
+
     subscription() {
         return this.belongsTo('StripeCustomerSubscription', 'subscription_id', 'id');
     },

package/core/server/services/mega/feedback-buttons.js

@@ -18,20 +18,32 @@ const generateLinks = (postId, uuid, html) => {
         0
     );
 
-    html = html.replace(templateStrings.like, positiveLink.href);
-    html = html.replace(templateStrings.dislike, negativeLink.href);
+    html = html.replace(new RegExp(templateStrings.like, 'g'), positiveLink.href);
+    html = html.replace(new RegExp(templateStrings.dislike, 'g'), negativeLink.href);
 
     return html;
 };
 
 const getTemplate = (accentColor) => {
-    const likeButtonHtml = getButtonHtml(templateStrings.like, 'More like this', accentColor);
-    const dislikeButtonHtml = getButtonHtml(templateStrings.dislike, 'Less like this', accentColor);
+    const likeButtonHtml = getButtonHtml(
+        templateStrings.like,
+        'More like this',
+        accentColor,
+        'like-icon',
+        'https://static.ghost.org/v5.0.0/images/thumbs-up.png'
+    );
+    const dislikeButtonHtml = getButtonHtml(
+        templateStrings.dislike,
+        'Less like this',
+        accentColor,
+        'dislike-icon',
+        'https://static.ghost.org/v5.0.0/images/thumbs-down.png'
+    );
 
     return (`
         <tr>
             <td dir="ltr" width="100%" style="background-color: #ffffff; text-align: center; padding: 40px 4px; border-bottom: 1px solid #e5eff5" align="center">
-                <h3 style="text-align: center; margin-bottom: 22px; font-size: 17px; letter-spacing: -0.2px; margin-top: 0 !important;">What did you think of this post?</h3>
+                <h3 style="text-align: center; margin-bottom: 22px; font-size: 17px; letter-spacing: -0.2px; margin-top: 0 !important;">Give feedback on this post</h3>
                 <table role="presentation" border="0" cellpadding="0" cellspacing="0" style="margin: auto; width: auto !important;">
                     <tr>
                         ${likeButtonHtml}
@@ -43,19 +55,44 @@ const getTemplate = (accentColor) => {
     `);
 };
 
-function getButtonHtml(href, buttonText, accentColor) {
-    const color = new Color(accentColor);
-    const bgColor = `${accentColor}10`;
-    const textColor = color.darken(0.6).hex();
+function getButtonHtml(href, buttonText, accentColor, className, iconUrl) {
+    const bgColor = getButtonLightTheme(accentColor).backgroundColor;
+    const textColor = getButtonLightTheme(accentColor).color;
 
     return (`
-        <td dir="ltr" valign="top" align="center" style="font-family: inherit; font-size: 14px; text-align: center;" nowrap>
-            <table align="center" role="presentation" cellspacing="0" cellpadding="0" border="0" style="width: auto !important;">
+         <td dir="ltr" valign="top" align="center" style="vertical-align: top; color: ${textColor}; font-family: inherit; font-size: 14px; text-align: center; padding: 0 8px;" nowrap>
+            <table class="feedback-buttons" align="center" role="presentation" cellspacing="0" cellpadding="0" border="0" style="background-color: ${bgColor}; overflow: hidden; border-radius: 22px;border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: auto;">
                 <tr>
-                    <td style="padding: 0 6px; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';">
-                        <a href=${href} style="background-color: ${bgColor}; color: ${textColor}; border-radius: 22px; font-family: inherit; padding: 12px 20px; border: none; font-size: 14px; font-weight: bold; line-height: 100%; text-decoration: none; display: block;">
-                            ${buttonText}
-                        </a>
+                    <td width="16" height="38" style="paddig-left:10px;"></td>
+                    <td class=${className} background=${iconUrl} bgcolor="${textColor}" width="24" height="38" valign="top" style="background-image: url(${iconUrl});vertical-align: middle; text-align: center;background-size: cover; background-position: 0 50%; background-repeat:no-repeat;">
+                        <!--[if gte mso 9]>
+                        <v:rect xmlns:v="urn:schemas-microsoft-com:vml" fill="true" stroke="false" style="width:24px;height:38px;">
+                            <v:fill origin="0.5, 0.5" position="0.5, 0.5" type="tile" src=${iconUrl} color="${textColor}" size="1,1" aspect="atleast" />
+                            <v:textbox inset="0,0,0,0">
+                        <![endif]-->
+                        <div>
+                            <a style="background-color: ${bgColor};border: none; width: 24px; height: 38px; display: block" href=${href} target="_blank"></a>
+                        </div>
+                        <!--[if gte mso 9]>
+                        </v:textbox>
+                        </v:rect>
+                        <![endif]-->
+                    </td>
+                    <td style="text-align: right;font-size: 18px; vertical-align: middle; color: ${textColor}!important; background-position: 0; padding: 0; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';">
+                        <div style="color: ${textColor}"><!--[if mso]>
+                            <v:rect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href=${href} style="height:38px;v-text-anchor:middle;width:120px;" stroke="f">
+                                <w:anchorlock/>
+                                <center>
+                            <![endif]-->
+                            <a
+                              href=${href}
+                              target="_blank"
+                              style="padding: 0 8px 0 8px;border-radius: 0 22px 22px 0;color:${textColor}!important;display:inline-block;font-family: inherit;font-size:14px;font-weight:bold;line-height:38px;text-align:left;text-decoration:none;width:100px;-webkit-text-size-adjust:none;">
+                              ${buttonText}</a>
+                            <!--[if mso]>
+                            </center>
+                            </v:rect>
+                            <![endif]--></div>
                     </td>
                 </tr>
             </table>
@@ -63,7 +100,41 @@ function getButtonHtml(href, buttonText, accentColor) {
     `);
 }
 
+function getButtonLightTheme(accentColor) {
+    const color = new Color(accentColor);
+    const backgroundColor = `${accentColor}10`;
+    const textColor = color.darken(0.6).hex();
+
+    return {
+        color: textColor,
+        backgroundColor
+    };
+}
+
+function getButtonsHeadStyles() {
+    return (`
+        .like-icon {
+            mix-blend-mode: darken;
+        }
+
+        .dislike-icon {
+            mix-blend-mode: darken;
+        }
+
+        @media (prefers-color-scheme: dark) {
+            .like-icon {
+                mix-blend-mode: initial !important;
+            }
+
+            .dislike-icon {
+                mix-blend-mode: initial !important;
+            }
+        }
+`);
+}
+
 module.exports = {
     generateLinks,
-    getTemplate
+    getTemplate,
+    getButtonsHeadStyles
 };

package/core/server/services/mega/mega.js

@@ -240,6 +240,7 @@ const addEmail = async (postModel, options) => {
             submitted_at: moment().toDate(),
             track_opens: !!settingsCache.get('email_track_opens'),
             track_clicks: !!settingsCache.get('email_track_clicks'),
+            feedback_enabled: !!newsletter.get('feedback_enabled'),
             recipient_filter: emailRecipientFilter,
             newsletter_id: newsletter.id
         }, knexOptions);

package/core/server/services/mega/template.js

@@ -37,6 +37,7 @@ module.exports = ({post, site, newsletter, templateSettings}) => {
 <head>
 <meta name="viewport" content="width=device-width" />
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<!--[if mso]><xml><o:OfficeDocumentSettings><o:PixelsPerInch>96</o:PixelsPerInch><o:AllowPNG/></o:OfficeDocumentSettings></xml><![endif]-->
 <title>${cleanPost.title}</title>
 <style>
 /* -------------------------------------
@@ -1161,6 +1162,8 @@ ${ templateSettings.showBadge ? `
 }
 ` : ''}
 
+${iff(templateSettings.feedbackEnabled, feedbackButtons.getButtonsHeadStyles(templateSettings.accentColor), '')}
+
 </style>
 </head>
 

package/core/server/services/member-attribution/index.js

@@ -1,5 +1,6 @@
 const urlService = require('../url');
 const urlUtils = require('../../../shared/url-utils');
+const settingsCache = require('../../../shared/settings-cache');
 
 class MemberAttributionServiceWrapper {
     init() {
@@ -38,7 +39,8 @@ class MemberAttributionServiceWrapper {
                 SubscriptionCreatedEvent: models.SubscriptionCreatedEvent,
                 Integration: models.Integration
             },
-            attributionBuilder: this.attributionBuilder
+            attributionBuilder: this.attributionBuilder,
+            isTrackingEnabled: !!settingsCache.get('members_track_sources')
         });
     }
 }

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

@@ -13,6 +13,7 @@ const SingleUseTokenProvider = require('./SingleUseTokenProvider');
 const urlUtils = require('../../../shared/url-utils');
 const labsService = require('../../../shared/labs');
 const offersService = require('../offers');
+const tiersService = require('../tiers');
 const newslettersService = require('../newsletters');
 const memberAttributionService = require('../member-attribution');
 
@@ -198,6 +199,7 @@ function createApiInstance(config) {
             MemberFeedback: models.MemberFeedback
         },
         stripeAPIService: stripeService.api,
+        tiersService: tiersService,
         offersAPI: offersService.api,
         labsService: labsService,
         newslettersService: newslettersService,

package/core/server/services/members/service.js

@@ -16,6 +16,7 @@ const config = require('../../../shared/config');
 const models = require('../../models');
 const {GhostMailer} = require('../mail');
 const jobsService = require('../jobs');
+const tiersService = require('../tiers');
 const VerificationTrigger = require('@tryghost/verification-trigger');
 const DatabaseInfo = require('@tryghost/database-info');
 const settingsHelpers = require('../settings-helpers');
@@ -47,7 +48,13 @@ let verificationTrigger;
 const membersImporter = new MembersCSVImporter({
     storagePath: config.getContentPath('data'),
     getTimezone: () => settingsCache.get('timezone'),
-    getMembersApi: () => module.exports.api,
+    getMembersRepository: async () => {
+        const api = await module.exports.api;
+        return api.members;
+    },
+    getDefaultTier: () => {
+        return tiersService.api.readDefaultTier();
+    },
     sendEmail: ghostMailer.send.bind(ghostMailer),
     isSet: labsService.isSet.bind(labsService),
     addJob: jobsService.addJob.bind(jobsService),

package/core/server/services/newsletters/index.js

@@ -4,6 +4,7 @@ const mail = require('../mail');
 const models = require('../../models');
 const urlUtils = require('../../../shared/url-utils');
 const limitService = require('../limits');
+const labs = require('../../../shared/labs');
 
 const MAGIC_LINK_TOKEN_VALIDITY = 24 * 60 * 60 * 1000;
 
@@ -13,5 +14,6 @@ module.exports = new NewslettersService({
     mail,
     singleUseTokenProvider: new SingleUseTokenProvider(models.SingleUseToken, MAGIC_LINK_TOKEN_VALIDITY),
     urlUtils,
-    limitService
+    limitService,
+    labs
 });

package/core/server/services/newsletters/service.js

@@ -21,13 +21,16 @@ class NewslettersService {
      * @param {Object} options.singleUseTokenProvider
      * @param {Object} options.urlUtils
      * @param {ILimitService} options.limitService
+     * @param {Object} options.labs
      */
-    constructor({NewsletterModel, MemberModel, mail, singleUseTokenProvider, urlUtils, limitService}) {
+    constructor({NewsletterModel, MemberModel, mail, singleUseTokenProvider, urlUtils, limitService, labs}) {
         this.NewsletterModel = NewsletterModel;
         this.MemberModel = MemberModel;
         this.urlUtils = urlUtils;
         /** @private */
         this.limitService = limitService;
+        /** @private */
+        this.labs = labs;
 
         /* email verification setup */
 
@@ -251,6 +254,13 @@ class NewslettersService {
             }
         }
 
+        if (cleanedAttrs.feedback_enabled) {
+            if (!this.labs.isSet('audienceFeedback')) {
+                // Not allowed to set to true
+                cleanedAttrs.feedback_enabled = false;
+            }
+        }
+
         return {cleanedAttrs, emailsToVerify};
     }