npm - ghost - Versions diffs - 5.22.11 → 5.23.0 - Mend

ghost 5.22.11 → 5.23.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (144) hide show

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

@@ -0,0 +1,163 @@
+module.exports = ({result, siteUrl, postsUrl, emailRecipient}) => `
+<!doctype html>
+<html>
+  <head>
+    <meta name="viewport" content="width=device-width">
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <title>Your content import is complete</title>
+    <style>
+    /* -------------------------------------
+        RESPONSIVE AND MOBILE FRIENDLY STYLES
+    ------------------------------------- */
+    @media only screen and (max-width: 620px) {
+      table[class=body] h1 {
+        font-size: 28px !important;
+        margin-bottom: 10px !important;
+      }
+      table[class=body] p,
+            table[class=body] ul,
+            table[class=body] ol,
+            table[class=body] td,
+            table[class=body] span,
+            table[class=body] a {
+        font-size: 16px !important;
+      }
+      table[class=body] .title {
+        font-size: 22px !important;
+      }
+      table[class=body] .wrapper,
+            table[class=body] .article {
+        padding: 10px !important;
+      }
+      table[class=body] .content {
+        padding: 0 !important;
+      }
+      table[class=body] .container {
+        padding: 0 !important;
+        width: 100% !important;
+      }
+      table[class=body] .main {
+        border-left-width: 0 !important;
+        border-radius: 0 !important;
+        border-right-width: 0 !important;
+      }
+      table[class=body] .btn table {
+        width: 100% !important;
+      }
+      table[class=body] .btn a {
+        width: 100% !important;
+      }
+      table[class=body] .img-responsive {
+        height: auto !important;
+        max-width: 100% !important;
+        width: auto !important;
+      }
+      table[class=body] p[class=small],
+      table[class=body] a[class=small] {
+        font-size: 12x !important;
+      }
+    }
+    /* -------------------------------------
+        PRESERVE THESE STYLES IN THE HEAD
+    ------------------------------------- */
+    @media all {
+      .ExternalClass {
+        width: 100%;
+      }
+      .ExternalClass,
+            .ExternalClass p,
+            .ExternalClass span,
+            .ExternalClass font,
+            .ExternalClass td,
+            .ExternalClass div {
+        line-height: 100%;
+      }
+      .recipient-link a {
+        color: inherit !important;
+        font-family: inherit !important;
+        font-size: inherit !important;
+        font-weight: inherit !important;
+        line-height: inherit !important;
+        text-decoration: none !important;
+      }
+      #MessageViewBody a {
+        color: inherit;
+        text-decoration: none;
+        font-size: inherit;
+        font-family: inherit;
+        font-weight: inherit;
+        line-height: inherit;
+      }
+    }
+    hr {
+      border-width: 0;
+      height: 0;
+      margin-top: 34px;
+      margin-bottom: 34px;
+      border-bottom-width: 1px;
+      border-bottom-color: #EEF5F8;
+    }
+    a {
+      color: #3A464C;
+    }
+    </style>
+  </head>
+  <body class="" style="background-color: #ffffff; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; -webkit-font-smoothing: antialiased; font-size: 14px; line-height: 1.5em; margin: 0; padding: 0; -ms-text-size-adjust: 100%; -webkit-text-size-adjust: 100%;">
+    <table border="0" cellpadding="0" cellspacing="0" class="body" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
+      <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;">&nbsp;</td>
+        <td class="container" 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; display: block; Margin: 0 auto; max-width: 540px; padding: 10px; width: 540px;">
+          <div class="content" style="box-sizing: border-box; display: block; Margin: 0 auto; max-width: 600px; padding: 30px 20px;">
+            <!-- START CENTERED CONTAINER -->
+            <span class="preheader" style="color: transparent; display: none; height: 0; max-height: 0; max-width: 0; opacity: 0; overflow: hidden; mso-hide: all; visibility: hidden; width: 0;">Your content import is complete</span>
+            <table class="main" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; background: #ffffff; border-radius: 8px;">
+              <!-- START MAIN CONTENT AREA -->
+              <tr>
+                <td class="wrapper" 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; box-sizing: border-box;">
+                  <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
+                    <tr>
+                      <td align="center" style="padding-top: 20px; padding-bottom: 12px;"><img src="https://static.ghost.org/v4.0.0/images/ghost-orb-4.png" width="60" height="60" style="width: 60px; height: 60px;" /></td>
+                    </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>
+                      </td>
+                    </tr>
+                    ${result.data.problems.length ? `
+                    <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>
+                    ` : `
+                    <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: 12px; padding-top: 16px;">
+                        <a href="${postsUrl.href}" target="_blank" style="display: inline-block; color: #ffffff; background-color: #15212A; border: solid 1px #15212A; border-radius: 5px; box-sizing: border-box; cursor: pointer; text-decoration: none; font-size: 16px; font-weight: normal; margin: 0; padding: 9px 22px 10px; border-color: #15212A;">View posts</a>
+                      </td>
+                    </tr>
+                    `}
+                  </table>
+                </td>
+              </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'; vertical-align: top; padding-top: 80px; padding-bottom: 10px;">
+                    <div class="footer">
+                      <p class="small" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; color: #738A94; font-weight: normal; margin: 0; line-height: 18px; margin-bottom: 0px; font-size: 11px;">This email was sent from <a href="${siteUrl.href}" style="color: #738A94;">${siteUrl.host}</a> to <a href="mailto:${emailRecipient}" style="color: #738A94;">${emailRecipient}</a></p>
+                    </div>
+                </td>
+              </tr>
+            <!-- END MAIN CONTENT AREA -->
+            </table>
+          <!-- END CENTERED CONTAINER -->
+          </div>
+        </td>
+        <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;">&nbsp;</td>
+      </tr>
+    </table>
+  </body>
+</html>
+`;

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

@@ -4,6 +4,7 @@ const path = require('path');
 const os = require('os');
 const glob = require('glob');
 const uuid = require('uuid');
+const config = require('../../../shared/config');
 const {extract} = require('@tryghost/zip');
 const tpl = require('@tryghost/tpl');
 const logging = require('@tryghost/logging');
@@ -13,6 +14,12 @@ const JSONHandler = require('./handlers/json');
 const MarkdownHandler = require('./handlers/markdown');
 const ImageImporter = require('./importers/image');
 const DataImporter = require('./importers/data');
+const urlUtils = require('../../../shared/url-utils');
+const {GhostMailer} = require('../../services/mail');
+const jobManager = require('../../services/jobs');
+const emailTemplate = require('./email-template');
+const ghostMailer = new GhostMailer();
 const messages = {
     couldNotCleanUpFile: {
@@ -115,28 +122,6 @@ class ImportManager {
         return prefix + this.getGlobPattern(directories);
     }
-    /**
-     * Remove files after we're done (abstracted into a function for easier testing)
-     * @returns {Promise<void>}
-     */
-    async cleanUp() {
-        if (this.fileToDelete === null) {
-            return;
-        }
-        try {
-            await fs.remove(this.fileToDelete);
-        } catch (err) {
-            logging.error(new errors.InternalServerError({
-                err: err,
-                context: tpl(messages.couldNotCleanUpFile.error),
-                help: tpl(messages.couldNotCleanUpFile.context)
-            }));
-        }
-        this.fileToDelete = null;
-    }
     /**
      * Return true if the given file is a Zip
      * @returns Boolean
@@ -333,15 +318,15 @@ class ImportManager {
      * data that it should import. Each importer then handles actually importing that data into Ghost
      * @param {ImportData} importData
      * @param {ImportOptions} [importOptions] to allow override of certain import features such as locking a user
-     * @returns {Promise<ImportResult[]>} importResults
+     * @returns {Promise<Object.<string, ImportResult>>} importResults
      */
     async doImport(importData, importOptions) {
         importOptions = importOptions || {};
-        const importResults = [];
+        const importResults = {};
         for (const importer of this.importers) {
             if (Object.prototype.hasOwnProperty.call(importData, importer.type)) {
-                importResults.push(await importer.doImport(importData[importer.type], importOptions));
+                importResults[importer.type] = await importer.doImport(importData[importer.type], importOptions);
             }
         }
@@ -351,45 +336,140 @@ class ImportManager {
     /**
      * Import Step 4:
      * Report on what was imported, currently a no-op
-     * @param {ImportResult[]} importResults
-     * @returns {Promise<ImportResult[]>} importResults
+     * @param {Object.<string, ImportResult>} importResults
+     * @returns {Promise<Object.<string, ImportResult>>} importResults
      */
     async generateReport(importResults) {
         return Promise.resolve(importResults);
     }
+    /**
+     * Step 5:
+     * Remove files after we're done (abstracted into a function for easier testing)
+     * @returns {Promise<void>}
+     */
+    async cleanUp() {
+        if (this.fileToDelete === null) {
+            return;
+        }
+        try {
+            await fs.remove(this.fileToDelete);
+        } catch (err) {
+            logging.error(new errors.InternalServerError({
+                err: err,
+                context: tpl(messages.couldNotCleanUpFile.error),
+                help: tpl(messages.couldNotCleanUpFile.context)
+            }));
+        }
+        this.fileToDelete = null;
+    }
+    /**
+     * Import Step 6:
+     * Create an email to notify the user that the import has completed
+     * @param {ImportResult} result
+     * @param {Object} options
+     * @param {string} options.emailRecipient
+     * @param {string} options.importTag
+     * @returns {string}
+     */
+    generateCompletionEmail(result, {
+        emailRecipient,
+        importTag
+    }) {
+        const siteUrl = new URL(urlUtils.urlFor('home', null, true));
+        const postsUrl = new URL('posts', urlUtils.urlFor('admin', null, true));
+        if (importTag && result?.data?.tags) {
+            const tag = result.data.tags.find(t => t.name === importTag);
+            postsUrl.searchParams.set('tag', tag.slug);
+        }
+        return emailTemplate({
+            result,
+            siteUrl,
+            postsUrl,
+            emailRecipient
+        });
+    }
     /**
      * Import From File
      * The main method of the ImportManager, call this to kick everything off!
      * @param {File} file
      * @param {ImportOptions} importOptions to allow override of certain import features such as locking a user
-     * @returns {Promise<ImportResult[]>}
+     * @returns {Promise<Object.<string, ImportResult>>}
      */
     async importFromFile(file, importOptions = {}) {
-        try {
+        let importData;
+        if (importOptions.data) {
+            importData = importOptions.data;
+        } else {
             // Step 1: Handle converting the file to usable data
-            let importData = await this.loadFile(file);
+            // Has to be completed outside of job to ensure file is processed before being deleted
+            importData = await this.loadFile(file);
+        }
+        const env = config.get('env');
+        if (!env?.startsWith('testing') && !importOptions.runningInJob) {
+            return jobManager.addJob({
+                job: () => this.importFromFile(file, Object.assign({}, importOptions, {
+                    runningInJob: true,
+                    data: importData
+                })),
+                offloaded: false
+            });
+        }
+        let importResult;
+        try {
             // Step 2: Let the importers pre-process the data
             importData = await this.preProcess(importData);
             // Step 3: Actually do the import
             // @TODO: It would be cool to have some sort of dry run flag here
-            let importResult = await this.doImport(importData, importOptions);
+            importResult = await this.doImport(importData, importOptions);
             // Step 4: Report on the import
-            return await this.generateReport(importResult);
+            importResult = await this.generateReport(importResult);
+            return importResult;
+        } catch (err) {
+            logging.error(`Content import was unsuccessful`, {
+                error: err
+            });
         } finally {
             // Step 5: Cleanup any files
-            this.cleanUp();
+            await this.cleanUp();
+            if (!env?.startsWith('testing')) {
+                // Step 6: Send email
+                const email = this.generateCompletionEmail(importResult, {
+                    emailRecipient: importOptions.user.email,
+                    importTag: importOptions.importTag
+                });
+                await ghostMailer.send({
+                    to: importOptions.user.email,
+                    subject: importResult.data.problems.length
+                        ? 'Your content import was unsuccessful'
+                        : 'Your content import has finished',
+                    html: email
+                });
+            }
         }
     }
 }
 /**
  * @typedef {object} ImportOptions
+ * @property {boolean} [runningInJob]
  * @property {boolean} [returnImportedData]
  * @property {boolean} [importPersistUser]
+ * @property {Object} [user]
+ * @property {string} [user.email]
+ * @property {string} [importTag]
+ * @property {Object} [data]
  */
 /**

package/core/server/data/importer/importers/data/base.js CHANGED Viewed

@@ -10,6 +10,7 @@ class Base {
         this.options = options;
         this.modelName = options.modelName;
+        // Problems are currently constructed but not displayed to the user
         this.problems = [];
         this.errors = [];

package/core/server/data/importer/importers/data/data-importer.js CHANGED Viewed

@@ -1,5 +1,5 @@
 const _ = require('lodash');
-const Promise = require('bluebird');
+const ObjectId = require('bson-objectid').default;
 const semver = require('semver');
 const {IncorrectUsageError} = require('@tryghost/errors');
 const debug = require('@tryghost/debug')('importer:data');
@@ -15,6 +15,7 @@ const StripeProductsImporter = require('./stripe-products');
 const StripePricesImporter = require('./stripe-prices');
 const CustomThemeSettingsImporter = require('./custom-theme-settings');
 const RolesImporter = require('./roles');
+const {slugify} = require('@tryghost/string/lib');
 let importers = {};
 let DataImporter;
@@ -46,6 +47,31 @@ DataImporter = {
     doImport: async function doImport(importData, importOptions) {
         importOptions = importOptions || {};
+        if (importOptions.importTag && importData?.data?.posts) {
+            const tagId = ObjectId().toHexString();
+            if (!('tags' in importData.data)) {
+                importData.data.tags = [];
+            }
+            importData.data.tags.push({
+                id: tagId,
+                name: importOptions.importTag,
+                slug: slugify(importOptions.importTag)
+            });
+            if (!('posts_tags' in importData.data)) {
+                importData.data.posts_tags = [];
+            }
+            for (const post of importData.data.posts) {
+                if (!('id' in post)) {
+                    // Make sure post has an id if it doesn't already
+                    post.id = ObjectId().toHexString();
+                }
+                importData.data.posts_tags.push({
+                    post_id: post.id,
+                    tag_id: tagId
+                });
+            }
+        }
         const ops = [];
         let problems = [];
         let errors = [];

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

@@ -83,7 +83,7 @@
             "type": "string"
         },
         "cover_image": {
-            "defaultValue": "https://static.ghost.org/v4.0.0/images/publication-cover.jpg",
+            "defaultValue": "https://static.ghost.org/v5.0.0/images/publication-cover.jpg",
             "type": "string"
         },
         "icon": {

package/core/server/models/base/plugins/bulk-operations.js CHANGED Viewed

@@ -101,7 +101,6 @@ module.exports = function (Bookshelf) {
          */
         bulkDestroy: function bulkDestroy(data, tableName, options = {}) {
             tableName = tableName || this.prototype.tableName;
             return del(Bookshelf.knex, tableName, data, options);
         }
     });

package/core/server/models/comment.js CHANGED Viewed

@@ -101,7 +101,7 @@ const Comment = ghostBookshelf.Model.extend({
     },
     enforcedFilters: function enforcedFilters(options) {
-        // Convenicence option to merge all filters with parent_id:null filter
+        // Convenience option to merge all filters with parent_id:null filter
         if (options.parentId !== undefined) {
             if (options.parentId === null) {
                 return 'parent_id:null';

package/core/server/models/member-newsletter.js ADDED Viewed

@@ -0,0 +1,9 @@
+const ghostBookshelf = require('./base');
+const MemberNewsletter = ghostBookshelf.Model.extend({
+    tableName: 'members_newsletters'
+});
+module.exports = {
+    MemberNewsletter: ghostBookshelf.model('MemberNewsletter', MemberNewsletter)
+};

package/core/server/models/member.js CHANGED Viewed

@@ -3,7 +3,6 @@ const uuid = require('uuid');
 const _ = require('lodash');
 const config = require('../../shared/config');
 const {gravatar} = require('../lib/image');
-const labs = require('../../shared/labs');
 const Member = ghostBookshelf.Model.extend({
     tableName: 'members',
@@ -154,11 +153,7 @@ const Member = ghostBookshelf.Model.extend({
             .query((qb) => {
                 // avoids bookshelf adding a `DISTINCT` to the query
                 // we know the result set will already be unique and DISTINCT hurts query performance
-                if (labs.isSet('compExpiring')) {
-                    qb.columns('products.*', 'expiry_at');
-                } else {
-                    qb.columns('products.*');
-                }
+                qb.columns('products.*', 'expiry_at');
             });
     },
@@ -207,9 +202,6 @@ const Member = ghostBookshelf.Model.extend({
     },
     async updateTierExpiry(products = [], options = {}) {
-        if (!labs.isSet('compExpiring')) {
-            return;
-        }
         for (const product of products) {
             if (product?.expiry_at) {
                 const expiry = new Date(product.expiry_at);

package/core/server/models/stripe-customer-subscription.js CHANGED Viewed

@@ -1,6 +1,5 @@
 const ghostBookshelf = require('./base');
 const _ = require('lodash');
-const labs = require('../../shared/labs');
 const StripeCustomerSubscription = ghostBookshelf.Model.extend({
     tableName: 'members_stripe_customers_subscriptions',
@@ -40,14 +39,11 @@ const StripeCustomerSubscription = ghostBookshelf.Model.extend({
             default_payment_card_last4: defaultSerializedObject.default_payment_card_last4,
             cancel_at_period_end: defaultSerializedObject.cancel_at_period_end,
             cancellation_reason: defaultSerializedObject.cancellation_reason,
-            current_period_end: defaultSerializedObject.current_period_end
+            current_period_end: defaultSerializedObject.current_period_end,
+            trial_start_at: defaultSerializedObject.trial_start_at,
+            trial_end_at: defaultSerializedObject.trial_end_at
         };
-        if (labs.isSet('freeTrial')) {
-            serialized.trial_start_at = defaultSerializedObject.trial_start_at;
-            serialized.trial_end_at = defaultSerializedObject.trial_end_at;
-        }
         if (!_.isEmpty(defaultSerializedObject.stripePrice)) {
             serialized.price = {
                 id: defaultSerializedObject.stripePrice.stripe_price_id,

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

@@ -70,28 +70,9 @@ module.exports = {
     FailedBatch,
     // accepts an ID rather than an Email model to better support running via a job queue
-    async processEmail({emailId, options}) {
+    async processEmail({emailModel, options}) {
         const knexOptions = _.pick(options, ['transacting', 'forUpdate']);
-        const emailModel = await models.Email.findOne({id: emailId}, knexOptions);
-        if (!emailModel) {
-            throw new errors.IncorrectUsageError({
-                message: 'Provided email id does not match a known email record',
-                context: {
-                    id: emailId
-                }
-            });
-        }
-        if (emailModel.get('status') !== 'pending') {
-            throw new errors.IncorrectUsageError({
-                message: 'Emails can only be processed when in the "pending" state',
-                context: `Email "${emailId}" has state "${emailModel.get('status')}"`,
-                code: 'EMAIL_NOT_PENDING'
-            });
-        }
-        await emailModel.save({status: 'submitting'}, Object.assign({}, knexOptions, {patch: true}));
+        const emailId = emailModel.get('id');
         // get batch IDs via knex to avoid model instantiation
         // only fetch pending or failed batches to avoid re-sending previously sent emails
@@ -141,6 +122,8 @@ module.exports = {
     // accepts an ID rather than an EmailBatch model to better support running via a job queue
     async processEmailBatch({emailBatchId, options, memberSegment}) {
+        logging.info('[sendEmailJob] Processing email batch ' + emailBatchId);
         const knexOptions = _.pick(options, ['transacting', 'forUpdate']);
         const emailBatchModel = await models.EmailBatch
@@ -166,7 +149,8 @@ module.exports = {
         const recipientRows = await models.EmailRecipient
             .getFilteredCollectionQuery({filter: `batch_id:${emailBatchId}`});
-        await emailBatchModel.save({status: 'submitting'}, knexOptions);
+        // Patch to prevent saving the related email model
+        await emailBatchModel.save({status: 'submitting'}, {...knexOptions, patch: true});
         try {
             // Load newsletter data on email
@@ -178,14 +162,18 @@ module.exports = {
             // send the email
             const sendResponse = await this.send(emailBatchModel.relations.email.toJSON(), recipientRows, memberSegment);
+            logging.info('[sendEmailJob] Submitted email batch ' + emailBatchId);
             // update batch success status
             return await emailBatchModel.save({
                 status: 'submitted',
                 provider_id: sendResponse.id.trim().replace(/^<|>$/g, '')
             }, Object.assign({}, knexOptions, {patch: true}));
         } catch (error) {
+            logging.info('[sendEmailJob] Failed email batch ' + emailBatchId);
             // update batch failed status
-            await emailBatchModel.save({status: 'failed'}, knexOptions);
+            await emailBatchModel.save({status: 'failed'}, {...knexOptions, patch: true});
             // log any error that didn't come from the provider which would have already logged it
             if (!error.code || error.code !== 'BULK_EMAIL_SEND_FAILED') {
@@ -213,6 +201,8 @@ module.exports = {
      * @returns {Promise<Object>} - {providerId: 'xxx'}
      */
     async send(emailData, recipients, memberSegment) {
+        logging.info(`[sendEmailJob] Sending email batch to ${recipients.length} recipients`);
         const mailgunConfigured = mailgunClient.isConfigured();
         if (!mailgunConfigured) {
             logging.warn('Bulk email has not been configured');
@@ -252,6 +242,7 @@ module.exports = {
         try {
             const response = await mailgunClient.send(emailData, recipientData, replacements);
             debug(`sent message (${Date.now() - startTime}ms)`);
+            logging.info(`[sendEmailJob] Sent message (${Date.now() - startTime}ms)`);
             return response;
         } catch (err) {
             let ghostError = new errors.EmailError({

package/core/server/services/email-suppression-list/index.js ADDED Viewed

	@@ -0,0 +1 @@
1	+ module.exports = require('./service');

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

@@ -0,0 +1,32 @@
+const {AbstractEmailSuppressionList, EmailSuppressionData} = require('@tryghost/email-suppression-list');
+class InMemoryEmailSuppressionList extends AbstractEmailSuppressionList {
+    async removeEmail(email) {
+        if (email === 'fail@member.test') {
+            return false;
+        }
+        return true;
+    }
+    async getSuppressionData(email) {
+        if (email === 'spam@member.test') {
+            return new EmailSuppressionData(true, {
+                timestamp: new Date(),
+                reason: 'spam'
+            });
+        }
+        if (email === 'fail@member.test') {
+            return new EmailSuppressionData(true, {
+                timestamp: new Date(),
+                reason: 'fail'
+            });
+        }
+        return new EmailSuppressionData(false);
+    }
+    async init() {
+        return;
+    }
+}
+module.exports = new InMemoryEmailSuppressionList();