ghost 5.25.4 → 5.26.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.25%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.26%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-86cf21b24691d4fe9a73bcf84e5b36fe.css" title="light">
+    <link integrity="" rel="stylesheet" href="assets/ghost-830670d910cea64d98ab083aafd1dffd.css" title="light">
 
     
 </head>
@@ -56,9 +56,9 @@
 
     <div id="ember-basic-dropdown-wormhole"></div>
 
-    <script src="assets/vendor-0d29a566ca9747f2cfba9d7c98e39f53.js"></script>
-<script src="assets/chunk.613.551c7c3e872b9a811863.js"></script>
-<script src="assets/chunk.143.c62201923eb26b9e05e6.js"></script>
-    <script src="assets/ghost-15f77300dbb6762873d6692e0485a37a.js"></script>
+    <script src="assets/vendor-5aae14724f891e36c43786254980485c.js"></script>
+<script src="assets/chunk.613.25718fa355a25fc2a7c1.js"></script>
+<script src="assets/chunk.143.51c2ca78fc65765021bd.js"></script>
+    <script src="assets/ghost-5429d972966c85a0a24d766f93db999d.js"></script>
 </body>
 </html>

package/core/frontend/helpers/get.js

@@ -117,9 +117,59 @@ function parseOptions(globals, data, options) {
     return options;
 }
 
+/**
+ *
+ * @param {String} resource
+ * @param {String} controllerName
+ * @param {String} action
+ * @param {Object} apiOptions
+ * @returns {Promise<Object>}
+ */
+async function makeAPICall(resource, controllerName, action, apiOptions) {
+    const controller = api[controllerName];
+
+    let timer;
+
+    try {
+        let response;
+
+        if (config.get('optimization:getHelper:timeout:threshold')) {
+            const logLevel = config.get('optimization:getHelper:timeout:level') || 'error';
+            const threshold = config.get('optimization:getHelper:timeout:threshold');
+
+            const apiResponse = controller[action](apiOptions);
+
+            const timeout = new Promise((resolve) => {
+                timer = setTimeout(() => {
+                    logging[logLevel](new errors.HelperWarning({
+                        message: `{{#get}} took longer than ${threshold}ms and was aborted`,
+                        code: 'ABORTED_GET_HELPER',
+                        errorDetails: {
+                            api: `${controllerName}.${action}`,
+                            apiOptions
+                        }
+                    }));
+
+                    resolve({[resource]: []});
+                }, threshold);
+            });
+
+            response = await Promise.race([apiResponse, timeout]);
+            clearTimeout(timer);
+        } else {
+            response = await controller[action](apiOptions);
+        }
+
+        return response;
+    } catch (err) {
+        clearTimeout(timer);
+        throw err;
+    }
+}
+
 /**
  * ## Get
- * @param {Object} resource
+ * @param {String} resource
  * @param {Object} options
  * @returns {Promise<any>}
  */
@@ -149,7 +199,6 @@ module.exports = async function get(resource, options) {
     }
 
     const controllerName = RESOURCES[resource].alias;
-    const controller = api[controllerName];
     const action = isBrowse(apiOptions) ? 'browse' : 'read';
 
     // Parse the options we're going to pass to the API
@@ -157,7 +206,7 @@ module.exports = async function get(resource, options) {
     apiOptions.context = {member: data.member};
 
     try {
-        const response = await controller[action](apiOptions);
+        const response = await makeAPICall(resource, controllerName, action, apiOptions);
 
         // prepare data properties for use with handlebars
         if (response[resource] && response[resource].length) {
@@ -185,19 +234,21 @@ module.exports = async function get(resource, options) {
         data.error = error.message;
         return options.inverse(self, {data: data});
     } finally {
-        const totalMs = Date.now() - start;
-        const logLevel = config.get('logging:slowHelper:level');
-        const threshold = config.get('logging:slowHelper:threshold');
-        if (totalMs > threshold) {
-            logging[logLevel](new errors.HelperWarning({
-                message: `{{#get}} helper took ${totalMs}ms to complete`,
-                code: 'SLOW_GET_HELPER',
-                errorDetails: {
-                    api: `${controllerName}.${action}`,
-                    apiOptions,
-                    returnedRows: returnedRowsCount
-                }
-            }));
+        if (config.get('optimization:getHelper:notify:threshold')) {
+            const totalMs = Date.now() - start;
+            const logLevel = config.get('optimization:getHelper:notify:level') || 'warn';
+            const threshold = config.get('optimization:getHelper:notify:threshold');
+            if (totalMs > threshold) {
+                logging[logLevel](new errors.HelperWarning({
+                    message: `{{#get}} helper took ${totalMs}ms to complete`,
+                    code: 'SLOW_GET_HELPER',
+                    errorDetails: {
+                        api: `${controllerName}.${action}`,
+                        apiOptions,
+                        returnedRows: returnedRowsCount
+                    }
+                }));
+            }
         }
     }
 };

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

@@ -83,7 +83,7 @@ module.exports = {
         permissions: true,
         query(frame) {
             const siteTimezone = settingsCache.get('timezone');
-            const importTag = `Import ${moment().tz(siteTimezone).format('YYYY-MM-DD HH:mm')}`;
+            const importTag = `#Import ${moment().tz(siteTimezone).format('YYYY-MM-DD HH:mm')}`;
             return importer.importFromFile(frame.file, {
                 user: {
                     email: frame.user.get('email')

package/core/server/api/endpoints/utils/serializers/output/mappers/newsletters.js

@@ -10,6 +10,7 @@ module.exports = (model, frame) => {
             name: jsonModel.name,
             description: jsonModel.description,
             slug: jsonModel.slug,
+            sender_email: jsonModel.sender_email,
             subscribe_on_signup: jsonModel.subscribe_on_signup,
             visibility: jsonModel.visibility,
             sort_order: jsonModel.sort_order,

package/core/server/data/importer/handlers/json.js

@@ -2,6 +2,7 @@ const _ = require('lodash');
 const fs = require('fs-extra');
 const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
+const debug = require('@tryghost/debug')('importer:handler:data');
 
 const messages = {
     invalidJsonFormat: 'Invalid JSON format, expected `{ db: [exportedData] }`',
@@ -17,6 +18,7 @@ JSONHandler = {
     directories: [],
 
     loadFile: async function (files, startDir) { // eslint-disable-line no-unused-vars
+        debug('loadFile', files);
         // @TODO: Handle multiple JSON files
         const filePath = files[0].path;
 

package/core/server/data/importer/handlers/revue.js

@@ -0,0 +1,44 @@
+const _ = require('lodash');
+const fs = require('fs-extra');
+const debug = require('@tryghost/debug')('importer:handler:revue');
+
+const hasIssuesCSV = (files) => {
+    return _.some(files, (file) => {
+        return file.name.match(/^issues.*?\.csv/);
+    });
+};
+
+const RevueHandler = {
+    type: 'revue',
+    extensions: ['.csv', '.json'],
+    contentTypes: ['application/octet-stream', 'application/json', 'text/plain'],
+    directories: [],
+
+    loadFile: function (files, startDir) {
+        debug('loadFile', files);
+        const startDirRegex = startDir ? new RegExp('^' + startDir + '/') : new RegExp('');
+        const idRegex = /_.*?\./;
+        const ops = [];
+        const revue = {};
+
+        if (!hasIssuesCSV(files)) {
+            return Promise.resolve();
+        }
+
+        _.each(files, function (file) {
+            ops.push(fs.readFile(file.path).then(function (content) {
+                // normalize the file name
+                file.name = file.name.replace(startDirRegex, '').replace(idRegex, '.');
+                const name = file.name.split('.')[0];
+
+                revue[name] = content.toString();
+            }));
+        });
+
+        return Promise.all(ops).then(() => {
+            return {meta: {revue: true}, revue};
+        });
+    }
+};
+
+module.exports = RevueHandler;

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

@@ -7,12 +7,15 @@ const uuid = require('uuid');
 const config = require('../../../shared/config');
 const {extract} = require('@tryghost/zip');
 const tpl = require('@tryghost/tpl');
+const debug = require('@tryghost/debug')('import-manager');
 const logging = require('@tryghost/logging');
 const errors = require('@tryghost/errors');
 const ImageHandler = require('./handlers/image');
+const RevueHandler = require('./handlers/revue');
 const JSONHandler = require('./handlers/json');
 const MarkdownHandler = require('./handlers/markdown');
 const ImageImporter = require('./importers/image');
+const RevueImporter = require('@tryghost/importer-revue');
 const DataImporter = require('./importers/data');
 const urlUtils = require('../../../shared/url-utils');
 const {GhostMailer} = require('../../services/mail');
@@ -48,12 +51,12 @@ class ImportManager {
         /**
          * @type {Importer[]} importers
          */
-        this.importers = [ImageImporter, DataImporter];
+        this.importers = [ImageImporter, RevueImporter, DataImporter];
 
         /**
          * @type {Handler[]}
          */
-        this.handlers = [ImageHandler, JSONHandler, MarkdownHandler];
+        this.handlers = [ImageHandler, RevueHandler, JSONHandler, MarkdownHandler];
 
         // Keep track of file to cleanup at the end
         /**
@@ -240,6 +243,8 @@ class ImportManager {
         for (const handler of this.handlers) {
             const files = this.getFilesFromZip(handler, zipDirectory);
 
+            debug('handler', handler.type, files);
+
             if (files.length > 0) {
                 if (Object.prototype.hasOwnProperty.call(importData, handler.type)) {
                     // This limitation is here to reduce the complexity of the importer for now
@@ -271,17 +276,19 @@ class ImportManager {
      * @param {File} file
      * @returns {Promise<ImportData>}
      */
-    processFile(file, ext) {
-        const fileHandler = _.find(this.handlers, function (handler) {
+    async processFile(file, ext) {
+        const fileHandlers = _.filter(this.handlers, function (handler) {
             return _.includes(handler.extensions, ext);
         });
 
-        return fileHandler.loadFile([_.pick(file, 'name', 'path')]).then(function (loadedData) {
-            // normalize the returned data
-            const importData = {};
-            importData[fileHandler.type] = loadedData;
-            return importData;
-        });
+        const importData = {};
+
+        await Promise.all(fileHandlers.map(async (fileHandler) => {
+            debug('fileHandler', fileHandler.type);
+            importData[fileHandler.type] = await fileHandler.loadFile([_.pick(file, 'name', 'path')]);
+        }));
+
+        return importData;
     }
 
     /**
@@ -305,6 +312,7 @@ class ImportManager {
      * @returns {Promise<ImportData>}
      */
     async preProcess(importData) {
+        debug('preProcess');
         for (const importer of this.importers) {
             importData = importer.preProcess(importData);
         }
@@ -321,10 +329,12 @@ class ImportManager {
      * @returns {Promise<Object.<string, ImportResult>>} importResults
      */
     async doImport(importData, importOptions) {
+        debug('doImport', this.importers);
         importOptions = importOptions || {};
         const importResults = {};
 
         for (const importer of this.importers) {
+            debug('importer looking for', importer.type, 'in', Object.keys(importData));
             if (Object.prototype.hasOwnProperty.call(importData, importer.type)) {
                 importResults[importer.type] = await importer.doImport(importData[importer.type], importOptions);
             }
@@ -411,6 +421,8 @@ class ImportManager {
             importData = await this.loadFile(file);
         }
 
+        debug('importFromFile completed file load', importData);
+
         const env = config.get('env');
         if (!env?.startsWith('testing') && !importOptions.runningInJob) {
             return jobManager.addJob({

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

@@ -14,6 +14,7 @@ const ProductsImporter = require('./products');
 const StripeProductsImporter = require('./stripe-products');
 const StripePricesImporter = require('./stripe-prices');
 const CustomThemeSettingsImporter = require('./custom-theme-settings');
+const RevueSubscriberImporter = require('./revue-subscriber');
 const RolesImporter = require('./roles');
 const {slugify} = require('@tryghost/string/lib');
 
@@ -24,6 +25,7 @@ DataImporter = {
     type: 'data',
 
     preProcess: function preProcess(importData) {
+        debug('preProcess');
         importData.preProcessedByData = true;
         return importData;
     },
@@ -39,12 +41,14 @@ DataImporter = {
         importers.stripe_prices = new StripePricesImporter(importData.data);
         importers.posts = new PostsImporter(importData.data);
         importers.custom_theme_settings = new CustomThemeSettingsImporter(importData.data);
+        importers.revue_subscribers = new RevueSubscriberImporter(importData.data);
 
         return importData;
     },
 
     // Allow importing with an options object that is passed through the importer
     doImport: async function doImport(importData, importOptions) {
+        debug('doImport');
         importOptions = importOptions || {};
 
         if (importOptions.importTag && importData?.data?.posts) {
@@ -55,7 +59,7 @@ DataImporter = {
             importData.data.tags.push({
                 id: tagId,
                 name: importOptions.importTag,
-                slug: slugify(importOptions.importTag)
+                slug: slugify(importOptions.importTag.replace(/^#/, 'hash-'))
             });
             if (!('posts_tags' in importData.data)) {
                 importData.data.posts_tags = [];

package/core/server/data/importer/importers/data/posts.js

@@ -272,7 +272,11 @@ class PostsImporter extends BaseImporter {
 
                 model.mobiledoc = JSON.stringify(mobiledoc);
                 model.html = mobiledocLib.mobiledocHtmlRenderer.render(JSON.parse(model.mobiledoc));
+            } else if (model.html) {
+                model.mobiledoc = JSON.stringify(mobiledocLib.htmlToMobiledocConverter(model.html));
+                model.html = mobiledocLib.mobiledocHtmlRenderer.render(JSON.parse(model.mobiledoc));
             }
+
             this.sanitizePostsMeta(model);
         });
 

package/core/server/data/importer/importers/data/revue-subscriber.js

@@ -0,0 +1,55 @@
+const debug = require('@tryghost/debug')('importer:revue-subscriber');
+const BaseImporter = require('./base');
+
+const papaparse = require('papaparse');
+const path = require('path');
+const fs = require('fs-extra');
+
+const config = require('../../../../../shared/config');
+const models = require('../../../../models');
+
+class RevueSubscriberImporter extends BaseImporter {
+    constructor(allDataFromFile) {
+        super(allDataFromFile, {
+            modelName: 'Member',
+            dataKeyToImport: 'revue_subscribers'
+        });
+    }
+
+    beforeImport() {
+        debug('beforeImport');
+        return super.beforeImport();
+    }
+
+    async doImport(options, importOptions) {
+        debug('doImport', this.modelName, this.dataToImport.length);
+
+        // Don't do anything if there is no data to import
+        if (this.dataToImport.length === 0) {
+            return Promise.resolve();
+        }
+
+        // required here rather than top-level to avoid pulling in before it's initialized during boot
+        const membersService = require('../../../../services/members');
+
+        const importLabel = importOptions.importTag ? importOptions.importTag.replace(/^#/, '') : null;
+
+        const outputFileName = `Converted ${importLabel}.csv`;
+        const outputFilePath = path.join(config.getContentPath('data'), '/', outputFileName);
+        const csvData = papaparse.unparse(this.dataToImport);
+
+        const memberImporterOptions = {
+            pathToCSV: outputFilePath,
+            globalLabels: [{name: importLabel}],
+            importLabel: {name: importLabel},
+            LabelModel: models.Label,
+            forceInline: true
+        };
+
+        await fs.writeFile(outputFilePath, csvData);
+
+        return membersService.processImport(memberImporterOptions);
+    }
+}
+
+module.exports = RevueSubscriberImporter;

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

@@ -571,19 +571,25 @@ async function createEmailBatches({emailModel, memberRows, memberSegment, option
     return batchIds;
 }
 
-const statusChangedHandler = (emailModel, options) => {
+const statusChangedHandler = async (emailModel, options) => {
     const emailRetried = emailModel.wasChanged()
         && emailModel.get('status') === 'pending'
         && emailModel.previous('status') === 'failed';
 
     if (emailRetried) {
-        pendingEmailHandler(emailModel, options);
+        await pendingEmailHandler(emailModel, options);
     }
 };
 
 function listen() {
-    events.on('email.added', pendingEmailHandler);
-    events.on('email.edited', statusChangedHandler);
+    events.on('email.added', (emailModel, options) => pendingEmailHandler(emailModel, options).catch((e) => {
+        logging.error('Error in email.added event handler');
+        logging.error(e);
+    }));
+    events.on('email.edited', (emailModel, options) => statusChangedHandler(emailModel, options).catch((e) => {
+        logging.error('Error in email.edited event handler');
+        logging.error(e);
+    }));
 }
 
 // Public API

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

@@ -77,7 +77,10 @@ const deleteSession = async function (req, res) {
         res.writeHead(204);
         res.end();
     } catch (err) {
-        res.writeHead(err.statusCode, {
+        if (!err.statusCode) {
+            logging.error(err);
+        }
+        res.writeHead(err.statusCode ?? 500, {
             'Content-Type': 'text/plain;charset=UTF-8'
         });
         res.end(err.message);
@@ -101,11 +104,20 @@ const getMemberData = async function (req, res) {
 const deleteSuppression = async function (req, res) {
     try {
         const member = await membersService.ssr.getMemberDataFromSession(req, res);
+        const options = {
+            id: member.id,
+            withRelated: ['newsletters']
+        };
         await emailSuppressionList.removeEmail(member.email);
+        await membersService.api.members.update({subscribed: true}, options);
+
         res.writeHead(204);
         res.end();
     } catch (err) {
-        res.writeHead(err.statusCode, {
+        if (!err.statusCode) {
+            logging.error(err);
+        }
+        res.writeHead(err.statusCode ?? 500, {
             'Content-Type': 'text/plain;charset=UTF-8'
         });
         res.end(err.message);
@@ -188,7 +200,10 @@ const updateMemberData = async function (req, res) {
             res.json(null);
         }
     } catch (err) {
-        res.writeHead(err.statusCode, {
+        if (!err.statusCode) {
+            logging.error(err);
+        }
+        res.writeHead(err.statusCode ?? 500, {
             'Content-Type': 'text/plain;charset=UTF-8'
         });
         res.end(err.message);

package/core/server/services/members-events/index.js

@@ -23,13 +23,16 @@ class MembersEventsServiceWrapper {
             labsService
         });
 
+        const db = require('../../data/db');
+
         this.lastSeenAtUpdater = new LastSeenAtUpdater({
             services: {
                 settingsCache
             },
             getMembersApi() {
                 return members.api;
-            }
+            },
+            db
         });
 
         this.eventStorage.subscribe(DomainEvents);

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

@@ -22,7 +22,9 @@ async function configureApi() {
 }
 
 const debouncedConfigureApi = _.debounce(() => {
-    configureApi();
+    configureApi().catch((err) => {
+        logging.error(err);
+    });
 }, 600);
 
 module.exports = new StripeService({

package/core/shared/config/defaults.json

@@ -58,11 +58,7 @@
         },
         "transports": [
             "stdout"
-        ],
-        "slowHelper": {
-            "level": "warn",
-            "threshold": 200
-        }
+        ]
     },
     "spam": {
         "user_login": {
@@ -145,6 +141,18 @@
             "maxAge": 0
         }
     },
+    "optimization": {
+        "getHelper": {
+            "timeout": {
+                "threshold": 5000,
+                "level": "error"
+            },
+            "notify": {
+                "threshold": 200,
+                "level": "warn"
+            }
+        }
+    },
     "imageOptimization": {
         "resize": true,
         "srcsets": true
@@ -161,7 +169,7 @@
     },
     "portal": {
         "url": "https://cdn.jsdelivr.net/ghost/portal@~{version}/umd/portal.min.js",
-        "version": "2.21"
+        "version": "2.22"
     },
     "sodoSearch": {
         "url": "https://cdn.jsdelivr.net/ghost/sodo-search@~{version}/umd/sodo-search.min.js",