ghost 5.23.0 → 5.24.0

package/core/built/admin/index.html

@@ -8,7 +8,7 @@
     <title>Ghost Admin</title>
 
     
-<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%225.23%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%7D" />
+<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%225.24%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%7D" />
 
     <meta name="HandheldFriendly" content="True" />
     <meta name="MobileOptimized" content="320" />
@@ -37,7 +37,7 @@
     </style>
 
     <link integrity="" rel="stylesheet" href="assets/vendor-3e6947aa681f0fb82b193090e520dc73.css">
-    <link integrity="" rel="stylesheet" href="assets/ghost-bbf3150c788d19852f14fc518b8ebb93.css" title="light">
+    <link integrity="" rel="stylesheet" href="assets/ghost-f428683b68c0eea9042acc7c021641e0.css" title="light">
 
     
 </head>
@@ -56,9 +56,9 @@
 
     <div id="ember-basic-dropdown-wormhole"></div>
 
-    <script src="assets/vendor-45c4a02c5360deeb66a0438a8bc7c18e.js"></script>
-<script src="assets/chunk.613.695f31829550fb00d43c.js"></script>
-<script src="assets/chunk.143.3dccaccd501e94a38af6.js"></script>
-    <script src="assets/ghost-64c5f32d4052347eed1ae73909b526ef.js"></script>
+    <script src="assets/vendor-04415b2b8a59aa9567dfa5d819ada71c.js"></script>
+<script src="assets/chunk.613.6bbcc18224567657fc2e.js"></script>
+<script src="assets/chunk.143.dd395a3e804fef2c3b21.js"></script>
+    <script src="assets/ghost-34bc21923675def87aa2516f72ca15d7.js"></script>
 </body>
 </html>

package/core/cli/record-test.js

@@ -0,0 +1,47 @@
+const {chromium} = require('@playwright/test');
+const Command = require('./command');
+const testUtils = require('../../test/utils');
+
+module.exports = class RecordTest extends Command {
+    setup() {
+        this.help('Use PlayWright to record a browser-based test');
+        this.argument('--admin', {type: 'boolean', defaultValue: false, desc: 'Start browser-based test in Ghost admin'});
+        this.argument('--no-setup', {type: 'boolean', defaultValue: false, desc: 'Disable the default setup, for testing Ghost admin setup'});
+        this.argument('--fixtures', {type: 'array', defaultValue: [], delimiter: ',', desc: 'A list of comma-separated fixtures to include'});
+    }
+
+    permittedEnvironments() {
+        return ['development', 'testing'];
+    }
+
+    async handle(argv) {
+        const app = await testUtils.startGhost();
+
+        if (argv.fixtures.length > 0) {
+            await testUtils.initFixtures(...argv.fixtures);
+        }
+
+        const browser = await chromium.launch({headless: false});
+
+        const baseURL = argv.admin ? `${app.url}ghost/` : app.url;
+        const context = await browser.newContext({
+            baseURL
+        });
+
+        // Pause the page, and start recording manually.
+        const page = await context.newPage();
+        await page.goto('');
+
+        if (argv.admin && !argv['no-setup']) {
+            await page.getByPlaceholder('The Daily Awesome').click();
+            await page.getByPlaceholder('The Daily Awesome').fill('The Local Test');
+            await page.getByPlaceholder('Jamie Larson').fill('Testy McTesterson');
+            await page.getByPlaceholder('jamie@example.com').fill('testy@example.com');
+            await page.getByPlaceholder('At least 10 characters').fill('Mc.T3ster$0n');
+            await page.getByPlaceholder('At least 10 characters').press('Enter');
+            await page.locator('.gh-done-pink').click();
+        }
+
+        await page.pause();
+    }
+};

package/core/frontend/apps/amp/lib/helpers/amp_content.js

@@ -108,7 +108,7 @@ allowedAMPAttributes = {
     'amp-audio': ['src', 'width', 'height', 'autoplay', 'loop', 'muted', 'controls'],
     'amp-iframe': ['src', 'srcdoc', 'width', 'height', 'layout', 'frameborder', 'allowfullscreen', 'allowtransparency',
         'sandbox', 'referrerpolicy'],
-    'amp-youtube': ['src', 'layout', 'frameborder', 'autoplay', 'loop', 'data-videoid', 'data-live-channelid']
+    'amp-youtube': ['src', 'layout', 'frameborder', 'autoplay', 'loop', 'data-videoid', 'data-live-channelid', 'width', 'height']
 };
 
 function getAmperizeHTML(html, post) {
@@ -193,6 +193,10 @@ module.exports = async function amp_content() { // eslint-disable-line camelcase
         $('audio').children('source').remove();
         $('audio').children('track').remove();
 
+        $('amp-youtube').attr('layout', 'responsive');
+        $('amp-youtube').attr('height', '350');
+        $('amp-youtube').attr('width', '600');
+
         ampHTML = $.html();
 
         // @TODO: remove this, when Amperize supports HTML sanitizing

package/core/server/api/endpoints/email-previews.js

@@ -2,7 +2,8 @@ const models = require('../../models');
 const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 const mega = require('../../services/mega');
-
+const emailService = require('../../services/email-service');
+const labs = require('../../../shared/labs');
 const messages = {
     postNotFound: 'Post not found.'
 };
@@ -29,6 +30,10 @@ module.exports = {
         ],
         permissions: true,
         async query(frame) {
+            if (labs.isSet('emailStability')) {
+                return await emailService.controller.previewEmail(frame);
+            }
+
             const options = Object.assign(frame.options, {formats: 'html,plaintext', withRelated: ['authors', 'posts_meta']});
             const data = Object.assign(frame.data, {status: 'all'});
 
@@ -61,6 +66,10 @@ module.exports = {
         },
         permissions: true,
         async query(frame) {
+            if (labs.isSet('emailStability')) {
+                return await emailService.controller.sendTestEmail(frame);
+            }
+
             const options = Object.assign(frame.options, {status: 'all'});
             let model = await models.Post.findOne(options, {withRelated: ['authors']});
 
@@ -69,7 +78,6 @@ module.exports = {
                     message: tpl(messages.postNotFound)
                 });
             }
-
             const {emails = [], memberSegment} = frame.data;
             return await mega.mega.sendTestEmail(model, emails, memberSegment);
         }

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

@@ -2,6 +2,8 @@ const models = require('../../models');
 const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 const megaService = require('../../services/mega');
+const emailService = require('../../services/email-service');
+const labs = require('../../../shared/labs');
 
 const messages = {
     emailNotFound: 'Email not found.',
@@ -57,23 +59,27 @@ module.exports = {
             'id'
         ],
         permissions: true,
-        query(frame) {
-            return models.Email.findOne(frame.data, frame.options)
-                .then(async (model) => {
-                    if (!model) {
-                        throw new errors.NotFoundError({
-                            message: tpl(messages.emailNotFound)
-                        });
-                    }
+        // (complexity removed with new labs flag)
+        // eslint-disable-next-line ghost/ghost-custom/max-api-complexity
+        async query(frame) {
+            if (labs.isSet('emailStability')) {
+                return await emailService.controller.retryFailedEmail(frame);
+            }
 
-                    if (model.get('status') !== 'failed') {
-                        throw new errors.IncorrectUsageError({
-                            message: tpl(messages.retryNotAllowed)
-                        });
-                    }
+            const model = await models.Email.findOne(frame.data, frame.options);
+            if (!model) {
+                throw new errors.NotFoundError({
+                    message: tpl(messages.emailNotFound)
+                });
+            }
 
-                    return await megaService.mega.retryFailedEmail(model);
+            if (model.get('status') !== 'failed') {
+                throw new errors.IncorrectUsageError({
+                    message: tpl(messages.retryNotAllowed)
                 });
+            }
+
+            return await megaService.mega.retryFailedEmail(model);
         }
     }
 };

package/core/server/data/importer/email-template.js

@@ -122,10 +122,10 @@ module.exports = ({result, siteUrl, postsUrl, emailRecipient}) => `
                     </tr>
                     <tr>
                       <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 16px; vertical-align: top;">
-                        <p class="title" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 21px; color: #3A464C; font-weight: normal; line-height: 25px; margin-bottom: 30px; margin-top: 50px; font-weight: 600; color: #15212A;">${result.data.problems.length ? 'Import unsuccessful' : 'Your content import has finished successfully'}</p>
+                        <p class="title" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 21px; color: #3A464C; font-weight: normal; line-height: 25px; margin-bottom: 30px; margin-top: 50px; font-weight: 600; color: #15212A;">${result?.data?.errors ? 'Import unsuccessful' : 'Your content import has finished successfully'}</p>
                       </td>
                     </tr>
-                    ${result.data.problems.length ? `
+                    ${result?.data?.errors ? `
                     <tr>
                       <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top; padding-bottom: 16px;">One or more error occured while importing your content. Please contact support or report on the <a href="https://forum.ghost.org/">Ghost Community Forum</a>.</td>
                     </tr>

package/core/server/data/importer/import-manager.js

@@ -439,6 +439,7 @@ class ImportManager {
             logging.error(`Content import was unsuccessful`, {
                 error: err
             });
+            importResult = {data: {errors: [err]}};
         } finally {
             // Step 5: Cleanup any files
             await this.cleanUp();
@@ -451,7 +452,7 @@ class ImportManager {
                 });
                 await ghostMailer.send({
                     to: importOptions.user.email,
-                    subject: importResult.data.problems.length
+                    subject: importResult?.data?.errors
                         ? 'Your content import was unsuccessful'
                         : 'Your content import has finished',
                     html: email

package/core/server/data/migrations/versions/5.24/2022-11-21-09-32-add-source-columns-to-emails-table.js

@@ -0,0 +1,17 @@
+const {createAddColumnMigration, combineNonTransactionalMigrations} = require('../../utils');
+
+module.exports = combineNonTransactionalMigrations(
+    createAddColumnMigration('emails', 'source', {
+        type: 'text',
+        maxlength: 1000000000,
+        fieldtype: 'long',
+        nullable: true
+    }),
+
+    createAddColumnMigration('emails', 'source_type', {
+        type: 'string',
+        maxlength: 50,
+        nullable: false,
+        defaultTo: 'html'
+    })
+);

package/core/server/data/migrations/versions/5.24/2022-11-21-15-03-populate-source-column-with-html-for-emails.js

@@ -0,0 +1,19 @@
+const logging = require('@tryghost/logging');
+const {createTransactionalMigration} = require('../../utils');
+
+module.exports = createTransactionalMigration(
+    async function up(knex) {
+        logging.info('Populating source from html in emails table');
+
+        const affectedRows = await knex('emails')
+            .update({
+                source: knex.ref('html')
+            });
+
+        logging.info(`Updated ${affectedRows} rows with source html data`);
+    },
+
+    async function down() {
+        // no-op: we don't want to remove the data
+    }
+);

package/core/server/data/migrations/versions/5.24/2022-11-21-15-57-add-error-columns-for-email-batches.js

@@ -0,0 +1,22 @@
+const {createAddColumnMigration, combineNonTransactionalMigrations} = require('../../utils');
+
+module.exports = combineNonTransactionalMigrations(
+    createAddColumnMigration('email_batches', 'error_status_code', {
+        type: 'integer',
+        nullable: true,
+        unsigned: true
+    }),
+
+    createAddColumnMigration('email_batches', 'error_message', {
+        type: 'string',
+        maxlength: 2000,
+        nullable: true
+    }),
+
+    createAddColumnMigration('email_batches', 'error_data', {
+        type: 'text',
+        maxlength: 1000000000,
+        fieldtype: 'long',
+        nullable: true
+    })
+);

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

@@ -783,6 +783,14 @@ module.exports = {
         reply_to: {type: 'string', maxlength: 2000, nullable: true},
         html: {type: 'text', maxlength: 1000000000, fieldtype: 'long', nullable: true},
         plaintext: {type: 'text', maxlength: 1000000000, fieldtype: 'long', nullable: true},
+        source: {type: 'text', maxlength: 1000000000, fieldtype: 'long', nullable: true},
+        source_type: {
+            type: 'string',
+            maxlength: 50,
+            nullable: false,
+            defaultTo: 'html',
+            validations: {isIn: [['html', 'lexical', 'mobiledoc']]}
+        },
         track_opens: {type: 'boolean', nullable: false, defaultTo: false},
         track_clicks: {type: 'boolean', nullable: false, defaultTo: false},
         feedback_enabled: {type: 'boolean', nullable: false, defaultTo: false},
@@ -805,6 +813,9 @@ module.exports = {
             validations: {isIn: [['pending', 'submitting', 'submitted', 'failed']]}
         },
         member_segment: {type: 'text', maxlength: 2000, nullable: true},
+        error_status_code: {type: 'integer', nullable: true, unsigned: true},
+        error_message: {type: 'string', maxlength: 2000, nullable: true},
+        error_data: {type: 'text', maxlength: 1000000000, fieldtype: 'long', nullable: true},
         created_at: {type: 'dateTime', nullable: false},
         updated_at: {type: 'dateTime', nullable: false}
     },

package/core/server/models/email.js

@@ -14,7 +14,8 @@ const Email = ghostBookshelf.Model.extend({
             feedback_enabled: false,
             delivered_count: 0,
             opened_count: 0,
-            failed_count: 0
+            failed_count: 0,
+            source_type: 'html'
         };
     },
 

package/core/server/services/email-service/index.js

@@ -0,0 +1,3 @@
+const EmailServiceWrapper = require('./wrapper');
+
+module.exports = new EmailServiceWrapper();

package/core/server/services/email-service/wrapper.js

@@ -0,0 +1,64 @@
+const logging = require('@tryghost/logging');
+const ObjectID = require('bson-objectid').default;
+
+class EmailServiceWrapper {
+    init() {
+        const {EmailService, EmailController, EmailRenderer, SendingService, BatchSendingService, EmailSegmenter} = require('@tryghost/email-service');
+        const {Post, Newsletter, Email, EmailBatch, EmailRecipient, Member} = require('../../models');
+        const settingsCache = require('../../../shared/settings-cache');
+        const jobsService = require('../jobs');
+        const membersService = require('../members');
+        const db = require('../../data/db');
+        const membersRepository = membersService.api.members;
+        const limitService = require('../limits');
+
+        const emailRenderer = new EmailRenderer();
+        const sendingService = new SendingService({
+            emailProvider: {
+                send: ({plaintext, subject, from, replyTo, recipients}) => {
+                    logging.info(`Sending email\nSubject: ${subject}\nFrom: ${from}\nReplyTo: ${replyTo}\nRecipients: ${recipients.length}\n\n${plaintext}`);
+                    return Promise.resolve({id: 'fake_provider_id_' + ObjectID().toHexString()});
+                }
+            },
+            emailRenderer
+        });
+
+        const emailSegmenter = new EmailSegmenter({
+            membersRepository
+        });
+        const batchSendingService = new BatchSendingService({
+            sendingService,
+            models: {
+                EmailBatch,
+                EmailRecipient,
+                Email,
+                Member
+            },
+            jobsService,
+            emailSegmenter,
+            emailRenderer,
+            db
+        });
+
+        this.service = new EmailService({
+            batchSendingService,
+            models: {
+                Email
+            },
+            settingsCache,
+            emailRenderer,
+            emailSegmenter,
+            limitService
+        });
+        
+        this.controller = new EmailController(this.service, {
+            models: {
+                Post,
+                Newsletter,
+                Email
+            }
+        });
+    }
+}
+
+module.exports = EmailServiceWrapper;

package/core/server/services/email-suppression-list/service.js

@@ -1,21 +1,27 @@
 const {AbstractEmailSuppressionList, EmailSuppressionData} = require('@tryghost/email-suppression-list');
 
 class InMemoryEmailSuppressionList extends AbstractEmailSuppressionList {
+    store = ['spam@member.test', 'fail@member.test'];
+
     async removeEmail(email) {
-        if (email === 'fail@member.test') {
-            return false;
+        if ((email === 'fail@member.test' || email === 'spam@member.test') && this.store.includes(email)) {
+            this.store = this.store.filter(el => el !== email);
+
+            setTimeout(() => this.store.push(email), 3000);
+            return true;
         }
-        return true;
+
+        return false;
     }
 
     async getSuppressionData(email) {
-        if (email === 'spam@member.test') {
+        if (email === 'spam@member.test' && this.store.includes(email)) {
             return new EmailSuppressionData(true, {
                 timestamp: new Date(),
                 reason: 'spam'
             });
         }
-        if (email === 'fail@member.test') {
+        if (email === 'fail@member.test' && this.store.includes(email)) {
             return new EmailSuppressionData(true, {
                 timestamp: new Date(),
                 reason: 'fail'

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

@@ -15,6 +15,8 @@ const db = require('../../data/db');
 const models = require('../../models');
 const postEmailSerializer = require('./post-email-serializer');
 const {getSegmentsFromHtml} = require('./segment-parser');
+const emailSuppressionList = require('../email-suppression-list');
+const labs = require('../../../shared/labs');
 
 // Used to listen to email.added and email.edited model events originally, I think to offload this - ideally would just use jobs now if possible
 const events = require('../../lib/common/events');
@@ -236,6 +238,8 @@ const addEmail = async (postModel, options) => {
             from: emailData.from,
             reply_to: emailData.replyTo,
             html: emailData.html,
+            source: emailData.html,
+            source_type: 'html',
             plaintext: emailData.plaintext,
             submitted_at: moment().toDate(),
             track_opens: !!settingsCache.get('email_track_opens'),
@@ -265,6 +269,10 @@ const retryFailedEmail = async (emailModel) => {
 };
 
 async function pendingEmailHandler(emailModel, options) {
+    if (labs.isSet('emailStability')) {
+        return;
+    }
+
     // CASE: do not send email if we import a database
     // TODO: refactor post.published events to never fire on importing
     if (options && options.importing) {
@@ -320,7 +328,7 @@ async function sendEmailJob({emailId, options}) {
                     }
                 });
             }
-    
+
             if (emailModel.get('status') !== 'pending') {
                 // We don't throw this, because we don't want to mark this email as failed
                 logging.error(new errors.IncorrectUsageError({
@@ -555,7 +563,13 @@ async function createEmailBatches({emailModel, memberRows, memberSegment, option
 
     debug('createEmailBatches: storing recipient list');
     const startOfRecipientStorage = Date.now();
-    const batches = _.chunk(memberRows, bulkEmailService.BATCH_SIZE);
+    const emails = memberRows.map(row => row.email);
+    const emailSuppressionData = await emailSuppressionList.getBulkSuppressionData(emails);
+    const emailSuppressedLookup = _.zipObject(emails, emailSuppressionData);
+    const filteredRows = memberRows.filter((row) => {
+        return emailSuppressedLookup[row.email].suppressed === false;
+    });
+    const batches = _.chunk(filteredRows, bulkEmailService.BATCH_SIZE);
     const batchIds = await Promise.mapSeries(batches, storeRecipientBatch);
     debug(`createEmailBatches: stored recipient list (${Date.now() - startOfRecipientStorage}ms)`);
     logging.info(`[createEmailBatches] stored recipient list (${Date.now() - startOfRecipientStorage}ms)`);

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

@@ -1,6 +1,7 @@
 const _ = require('lodash');
 const logging = require('@tryghost/logging');
 const membersService = require('./service');
+const emailSuppressionList = require('../email-suppression-list');
 const models = require('../../models');
 const urlUtils = require('../../../shared/url-utils');
 const spamPrevention = require('../../web/shared/middleware/api/spam-prevention');
@@ -39,7 +40,7 @@ const authMemberByUuid = async function (req, res, next) {
                 // Already authenticated via session
                 return next();
             }
-            
+
             throw new errors.UnauthorizedError({
                 messsage: tpl(messages.missingUuid)
             });
@@ -97,6 +98,20 @@ const getMemberData = async function (req, res) {
     }
 };
 
+const deleteSuppression = async function (req, res) {
+    try {
+        const member = await membersService.ssr.getMemberDataFromSession(req, res);
+        await emailSuppressionList.removeEmail(member.email);
+        res.writeHead(204);
+        res.end();
+    } catch (err) {
+        res.writeHead(err.statusCode, {
+            'Content-Type': 'text/plain;charset=UTF-8'
+        });
+        res.end(err.message);
+    }
+};
+
 const getMemberNewsletters = async function (req, res) {
     try {
         const memberUuid = req.query.uuid;
@@ -262,5 +277,6 @@ module.exports = {
     getMemberData,
     updateMemberData,
     updateMemberNewsletters,
-    deleteSession
+    deleteSession,
+    deleteSuppression
 };

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

@@ -56,7 +56,7 @@ const membersImporter = new MembersCSVImporter({
         return tiersService.api.readDefaultTier();
     },
     sendEmail: ghostMailer.send.bind(ghostMailer),
-    isSet: labsService.isSet.bind(labsService),
+    isSet: flag => labsService.isSet(flag),
     addJob: jobsService.addJob.bind(jobsService),
     knex: db.knex,
     urlFor: urlUtils.urlFor.bind(urlUtils),

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

@@ -1,3 +1,5 @@
+const labsService = require('../../../shared/labs');
+
 function formatNewsletterResponse(newsletters) {
     return newsletters.map(({id, name, description, sort_order: sortOrder}) => {
         return {id, name, description, sort_order: sortOrder};
@@ -23,5 +25,10 @@ module.exports.formattedMemberResponse = function formattedMemberResponse(member
     if (member.newsletters) {
         data.newsletters = formatNewsletterResponse(member.newsletters);
     }
+
+    if (labsService.isSet('suppressionList') && member.email_suppression) {
+        data.email_suppression = member.email_suppression;
+    }
+
     return data;
 };

package/core/server/services/posts/posts-service.js

@@ -8,12 +8,13 @@ const messages = {
 };
 
 class PostsService {
-    constructor({mega, urlUtils, models, isSet, stats}) {
+    constructor({mega, urlUtils, models, isSet, stats, emailService}) {
         this.mega = mega;
         this.urlUtils = urlUtils;
         this.models = models;
         this.isSet = isSet;
         this.stats = stats;
+        this.emailService = emailService;
     }
 
     async editPost(frame) {
@@ -41,12 +42,22 @@ class PostsService {
 
             if (sendEmail) {
                 let postEmail = model.relations.email;
+                let email;
 
                 if (!postEmail) {
-                    const email = await this.mega.addEmail(model, frame.options);
-                    model.set('email', email);
+                    if (this.isSet('emailStability')) {
+                        email = await this.emailService.createEmail(model);
+                    } else {
+                        email = await this.mega.addEmail(model, frame.options);
+                    }
                 } else if (postEmail && postEmail.get('status') === 'failed') {
-                    const email = await this.mega.retryFailedEmail(postEmail);
+                    if (this.isSet('emailStability')) {
+                        email = await this.emailService.retryEmail(postEmail);
+                    } else {
+                        email = await this.mega.retryFailedEmail(postEmail);
+                    }
+                }
+                if (email) {
                     model.set('email', email);
                 }
             }
@@ -123,6 +134,7 @@ const getPostServiceInstance = () => {
     const labs = require('../../../shared/labs');
     const models = require('../../models');
     const PostStats = require('./stats/post-stats');
+    const emailService = require('../email-service');
 
     const postStats = new PostStats();
 
@@ -130,8 +142,9 @@ const getPostServiceInstance = () => {
         mega: mega,
         urlUtils: urlUtils,
         models: models,
-        isSet: labs.isSet.bind(labs),
-        stats: postStats
+        isSet: flag => labs.isSet(flag), // don't use bind, that breaks test subbing of labs
+        stats: postStats,
+        emailService: emailService.service
     });
 };