ghost 5.22.9 → 5.22.10

package/core/built/admin/index.html

@@ -37,7 +37,7 @@
     </style>
 
     <link integrity="" rel="stylesheet" href="assets/vendor-3e6947aa681f0fb82b193090e520dc73.css">
-    <link integrity="" rel="stylesheet" href="assets/ghost-be360e360f53a63fafd228ae89bf96c8.css" title="light">
+    <link integrity="" rel="stylesheet" href="assets/ghost-03c7a25d23ad4d0725da171f8d7c7b2a.css" title="light">
 
     
 </head>
@@ -58,7 +58,7 @@
 
     <script src="assets/vendor-dc9f883b3468ff84794cf13741e6c4b4.js"></script>
 <script src="assets/chunk.613.695f31829550fb00d43c.js"></script>
-<script src="assets/chunk.143.f9b9a3ccbc33fc98b4dd.js"></script>
-    <script src="assets/ghost-dab6700715992e873d0672192fc8e2be.js"></script>
+<script src="assets/chunk.143.efc32dbcc893663c95cb.js"></script>
+    <script src="assets/ghost-b204dcc6ad523053868da9b2d8d65f80.js"></script>
 </body>
 </html>

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

@@ -1,5 +1,4 @@
 const _ = require('lodash');
-const Promise = require('bluebird');
 const fs = require('fs-extra');
 const moment = require('moment');
 const featuredImageRegex = /^(!\[]\(([^)]*?)\)\s+)(?=#)/;

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

@@ -1,6 +1,5 @@
 const debug = require('@tryghost/debug')('importer:base');
 const _ = require('lodash');
-const Promise = require('bluebird');
 const ObjectId = require('bson-objectid').default;
 const errors = require('@tryghost/errors');
 const {sequence} = require('@tryghost/promise');
@@ -12,6 +11,7 @@ class Base {
         this.modelName = options.modelName;
 
         this.problems = [];
+        this.errors = [];
 
         this.errorConfig = {
             allowDuplicates: true,
@@ -165,11 +165,11 @@ class Base {
             this.problems = this.problems.concat(problems);
             debug('detected problem/warning', problems);
 
-            return Promise.resolve();
+            return;
         }
 
         debug('err', errorsToReject, obj);
-        return Promise.reject(errorsToReject);
+        this.errors = this.errors.concat(errorsToReject);
     }
 
     /**
@@ -317,50 +317,37 @@ class Base {
         };
     }
 
-    doImport(options, importOptions) {
+    async doImport(options, importOptions) {
         debug('doImport', this.modelName, this.dataToImport.length);
 
         let ops = [];
 
         _.each(this.dataToImport, (obj, index) => {
-            ops.push(() => {
-                return models[this.modelName].add(obj, options)
-                    .then((importedModel) => {
-                        obj.model = {
-                            id: importedModel.id
-                        };
-
-                        if (importOptions.returnImportedData) {
-                            this.importedDataToReturn.push(importedModel.toJSON());
-                        }
-
-                        // for identifier lookup
-                        this.importedData.push(
-                            this.mapImportedData(obj, importedModel)
-                        );
-
-                        importedModel = null;
-                        this.dataToImport.splice(index, 1);
-                    })
-                    .catch((err) => {
-                        return this.handleError(err, obj);
-                    })
-                    .reflect();
+            ops.push(async () => {
+                try {
+                    const importedModel = await models[this.modelName].add(obj, options);
+                    obj.model = {
+                        id: importedModel.id
+                    };
+
+                    if (importOptions.returnImportedData) {
+                        this.importedDataToReturn.push(importedModel.toJSON());
+                    }
+
+                    // for identifier lookup
+                    this.importedData.push(
+                        this.mapImportedData(obj, importedModel)
+                    );
+
+                    // To free memory early
+                    this.dataToImport.splice(index, 1);
+                } catch (err) {
+                    this.handleError(err, obj);
+                }
             });
         });
 
-        /**
-         * NOTE: Do not run with Promise.all in this case. With a large import file, we run an enormous
-         *       amount of queries in parallel. Node will very fast eat lot's of memory, because all queries start
-         *       at the same time, but memory can only be released if the query finished.
-         *
-         *       Promise.map(.., {concurrency: Int}) was not really improving the end performance for me.
-         */
-        return sequence(ops).then((response) => {
-            this.dataToImport = null;
-            ops = null;
-            return response;
-        });
+        await sequence(ops);
     }
 }
 

package/core/server/data/importer/importers/data/custom-theme-settings.js

@@ -1,9 +1,9 @@
 const _ = require('lodash');
-const Promise = require('bluebird');
 const debug = require('@tryghost/debug')('importer:roles');
 const BaseImporter = require('./base');
 const models = require('../../../../models');
 const {activate} = require('../../../../services/themes/activate');
+const {sequence} = require('@tryghost/promise');
 
 class CustomThemeSettingsImporter extends BaseImporter {
     constructor(allDataFromFile) {
@@ -18,64 +18,48 @@ class CustomThemeSettingsImporter extends BaseImporter {
         return super.beforeImport();
     }
 
-    doImport(options, importOptions) {
+    async doImport(options, importOptions) {
         debug('doImport', this.modelName, this.dataToImport.length);
 
         let ops = [];
 
         _.each(this.dataToImport, (item) => {
-            ops.push(models.CustomThemeSetting.findOne({theme: item.theme, key: item.key}, options)
-                .then((setting) => {
-                    if (_.isObject(item.value)) {
-                        item.value = JSON.stringify(item.value);
-                    }
-                    
-                    if (setting) {
-                        setting.set('value', item.value);
-                        if (setting.hasChanged()) {
-                            return setting.save(null, options)
-                                .then((importedModel) => {
-                                    if (importOptions.returnImportedData) {
-                                        this.importedDataToReturn.push(importedModel.toJSON());
-                                    }
-                                    return importedModel;
-                                })
-                                .catch((err) => {
-                                    return this.handleError(err, item);
-                                });
-                        }
+            ops.push(async () => {
+                const setting = await models.CustomThemeSetting.findOne({theme: item.theme, key: item.key}, options);
+                if (_.isObject(item.value)) {
+                    item.value = JSON.stringify(item.value);
+                }
 
-                        return Promise.resolve();
-                    }
+                if (setting) {
+                    setting.set('value', item.value);
+                }
 
-                    return models.CustomThemeSetting.add(item, options)
-                        .then((importedModel) => {
-                            if (importOptions.returnImportedData) {
-                                this.importedDataToReturn.push(importedModel.toJSON());
-                            }
-                            return importedModel;
-                        })
-                        .catch((err) => {
-                            return this.handleError(err, item);
-                        });
-                })
-                .reflect());
-        });
-        
-        const opsPromise = Promise.all(ops);
+                if (setting && !setting.hasChanged()) {
+                    return;
+                }
 
-        // activate function is called to refresh cache when importing custom theme settings for active theme
-        opsPromise.then(() => {
-            models.Settings.findOne({key: 'active_theme'})
-                .then((theme) => {
-                    const currentTheme = theme.get('value');
-                    if (this.dataToImport.some(themeSetting => themeSetting.theme === currentTheme)) {
-                        activate(currentTheme);
+                try {
+                    const importedModel = setting
+                        ? await setting.save(null, options)
+                        : await models.CustomThemeSetting.add(item, options);
+
+                    if (importOptions.returnImportedData) {
+                        this.importedDataToReturn.push(importedModel.toJSON());
                     }
-                });
+                } catch (err) {
+                    this.handleError(err, item);
+                }
+            });
         });
 
-        return opsPromise;
+        await sequence(ops);
+
+        models.Settings.findOne({key: 'active_theme'}).then((theme) => {
+            const currentTheme = theme.get('value');
+            if (this.dataToImport.some(themeSetting => themeSetting.theme === currentTheme)) {
+                activate(currentTheme);
+            }
+        });
     }
 }
-module.exports = CustomThemeSettingsImporter;
+module.exports = CustomThemeSettingsImporter;

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

@@ -15,6 +15,7 @@ const StripeProductsImporter = require('./stripe-products');
 const StripePricesImporter = require('./stripe-prices');
 const CustomThemeSettingsImporter = require('./custom-theme-settings');
 const RolesImporter = require('./roles');
+
 let importers = {};
 let DataImporter;
 
@@ -42,12 +43,13 @@ DataImporter = {
     },
 
     // Allow importing with an options object that is passed through the importer
-    doImport: function doImport(importData, importOptions) {
+    doImport: async function doImport(importData, importOptions) {
         importOptions = importOptions || {};
 
         const ops = [];
+        let problems = [];
         let errors = [];
-        let results = [];
+        let importedData = {};
 
         const modelOptions = {
             importing: true,
@@ -89,36 +91,34 @@ DataImporter = {
 
         this.init(importData);
 
-        return models.Base.transaction(function (transacting) {
+        return models.Base.transaction(async function (transacting) {
             modelOptions.transacting = transacting;
 
             _.each(importers, function (importer) {
-                ops.push(function doModelImport() {
-                    return importer.fetchExisting(modelOptions, importOptions)
-                        .then(function () {
-                            return importer.beforeImport(modelOptions, importOptions);
-                        })
-                        .then(function () {
-                            if (importer.options.requiredImportedData.length) {
-                                _.each(importer.options.requiredImportedData, (key) => {
-                                    importer.requiredImportedData[key] = importers[key].importedData;
-                                });
-                            }
-
-                            if (importer.options.requiredExistingData.length) {
-                                _.each(importer.options.requiredExistingData, (key) => {
-                                    importer.requiredExistingData[key] = importers[key].existingData;
-                                });
-                            }
-
-                            return importer.replaceIdentifiers(modelOptions, importOptions);
-                        })
-                        .then(function () {
-                            return importer.doImport(modelOptions, importOptions)
-                                .then(function (_results) {
-                                    results = results.concat(_results);
-                                });
+                ops.push(async function doModelImport() {
+                    await importer.fetchExisting(modelOptions, importOptions);
+                    await importer.beforeImport(modelOptions, importOptions);
+
+                    if (importer.options.requiredImportedData.length) {
+                        _.each(importer.options.requiredImportedData, (key) => {
+                            importer.requiredImportedData[key] = importers[key].importedData;
+                        });
+                    }
+
+                    if (importer.options.requiredExistingData.length) {
+                        _.each(importer.options.requiredExistingData, (key) => {
+                            importer.requiredExistingData[key] = importers[key].existingData;
                         });
+                    }
+
+                    await importer.replaceIdentifiers(modelOptions, importOptions);
+                    await importer.doImport(modelOptions, importOptions);
+
+                    errors = errors.concat(importer.errors);
+                    problems = problems.concat(importer.problems);
+                    if (importOptions.returnImportedData) {
+                        importedData[importer.dataKeyToImport] = importer.importedDataToReturn;
+                    }
                 });
             });
 
@@ -151,49 +151,19 @@ DataImporter = {
                 return sequence(productOps);
             });
 
-            return sequence(ops)
-                .then(function () {
-                    results.forEach(function (promise) {
-                        if (!promise.isFulfilled()) {
-                            errors = errors.concat(promise.reason());
-                        }
-                    });
+            await sequence(ops);
 
-                    if (errors.length === 0) {
-                        return;
-                    } else {
-                        throw errors;
-                    }
-                });
-        }).then(function () {
-            /**
-             * data: imported data
-             * originalData: data from the json file
-             * problems: warnings
-             */
-            const toReturn = {
-                data: {},
+            // Errors preventing import:
+            if (errors.length > 0) {
+                debug(errors);
+                throw errors;
+            }
+
+            return {
+                data: importedData,
                 originalData: importData.data,
-                problems: []
+                problems: problems
             };
-
-            _.each(importers, function (importer) {
-                toReturn.problems = toReturn.problems.concat(importer.problems);
-
-                if (importOptions.returnImportedData) {
-                    toReturn.data[importer.dataKeyToImport] = importer.importedDataToReturn;
-                }
-            });
-
-            return toReturn;
-        }).catch(function (err) {
-            debug(err);
-            return Promise.reject(err);
-        }).finally(() => {
-            // release memory
-            importers = {};
-            results = null;
-            importData = null;
         });
     }
 };

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

@@ -1,5 +1,4 @@
 const debug = require('@tryghost/debug')('importer:settings');
-const Promise = require('bluebird');
 const ObjectId = require('bson-objectid').default;
 const _ = require('lodash');
 const BaseImporter = require('./base');
@@ -8,6 +7,7 @@ const defaultSettings = require('../../../schema').defaultSettings;
 const keyGroupMapper = require('../../../../api/endpoints/utils/serializers/input/utils/settings-key-group-mapper');
 const keyTypeMapper = require('../../../../api/endpoints/utils/serializers/input/utils/settings-key-type-mapper');
 const {WRITABLE_KEYS_ALLOWLIST} = require('../../../../../shared/labs');
+const {sequence} = require('@tryghost/promise');
 
 const labsDefaults = JSON.parse(defaultSettings.labs.labs.defaultValue);
 const ignoredSettings = ['slack_url', 'members_from_address', 'members_support_address', 'portal_products'];
@@ -252,22 +252,22 @@ class SettingsImporter extends BaseImporter {
         return Promise.resolve();
     }
 
-    doImport(options) {
+    async doImport(options) {
         debug('doImport', this.dataToImport.length);
 
         let ops = [];
 
         _.each(this.dataToImport, (model) => {
-            ops.push(
-                models.Settings.edit(model, options)
-                    .catch((err) => {
-                        return this.handleError(err, model);
-                    })
-                    .reflect()
-            );
+            ops.push(async () => {
+                try {
+                    await models.Settings.edit(model, options);
+                } catch (err) {
+                    this.handleError(err, model);
+                }
+            });
         });
 
-        return Promise.all(ops);
+        await sequence(ops);
     }
 }
 

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

@@ -1,8 +1,8 @@
 const debug = require('@tryghost/debug')('importer:tags');
-const Promise = require('bluebird');
 const _ = require('lodash');
 const BaseImporter = require('./base');
 const models = require('../../../../models');
+const {sequence} = require('@tryghost/promise');
 
 class TagsImporter extends BaseImporter {
     constructor(allDataFromFile) {
@@ -33,45 +33,44 @@ class TagsImporter extends BaseImporter {
      *
      * @TODO: Add a flag to the base implementation e.g. `fetchBeforeAdd`
      */
-    doImport(options, importOptions) {
+    async doImport(options, importOptions) {
         debug('doImport', this.modelName, this.dataToImport.length);
 
         let ops = [];
 
         _.each(this.dataToImport, (obj) => {
-            ops.push(models[this.modelName].findOne({name: obj.name}, options)
-                .then((tag) => {
+            ops.push(async () => {
+                if (obj.slug) {
+                    const tag = await models[this.modelName].findOne({slug: obj.slug}, options);
                     if (tag) {
-                        return Promise.resolve();
+                        return;
                     }
+                }
 
-                    return models[this.modelName].add(obj, options)
-                        .then((importedModel) => {
-                            obj.model = {
-                                id: importedModel.id
-                            };
+                try {
+                    const importedModel = await models[this.modelName].add(obj, options);
+                    obj.model = {
+                        id: importedModel.id
+                    };
 
-                            if (importOptions.returnImportedData) {
-                                this.importedDataToReturn.push(importedModel.toJSON());
-                            }
-
-                            // for identifier lookup
-                            this.importedData.push({
-                                id: importedModel.id,
-                                originalId: this.originalIdMap[importedModel.id],
-                                slug: importedModel.get('slug'),
-                                originalSlug: obj.slug
-                            });
+                    if (importOptions.returnImportedData) {
+                        this.importedDataToReturn.push(importedModel.toJSON());
+                    }
 
-                            return importedModel;
-                        })
-                        .catch((err) => {
-                            return this.handleError(err, obj);
-                        });
-                }).reflect());
+                    // for identifier lookup
+                    this.importedData.push({
+                        id: importedModel.id,
+                        originalId: this.originalIdMap[importedModel.id],
+                        slug: importedModel.get('slug'),
+                        originalSlug: obj.slug
+                    });
+                } catch (err) {
+                    this.handleError(err, obj);
+                }
+            });
         });
 
-        return Promise.all(ops);
+        await sequence(ops);
     }
 }
 

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

@@ -215,7 +215,7 @@ class FixtureManager {
         // would change the fixturesHash.
         modelFixture = _.cloneDeep(modelFixture);
         // The Post model fixtures need a `published_at` date, where at least the seconds
-        // are different, otherwise `prev_post` and `next_post` helpers won't workd with
+        // are different, otherwise `prev_post` and `next_post` helpers won't work with
         // them.
         if (modelFixture.name === 'Post') {
             _.forEach(modelFixture.entries, (post, index) => {

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

@@ -58,20 +58,34 @@ const getTemplate = (accentColor) => {
 function getButtonHtml(href, buttonText, accentColor, className, iconUrl) {
     const bgColor = getButtonLightTheme(accentColor).backgroundColor;
     const textColor = getButtonLightTheme(accentColor).color;
+    const buttonAttr = {
+        width: 100,
+        height: 38,
+        iconWidth: 24
+    };
+
+    // Sizes defined in pixels won’t be adjusted when Outlook is rendering at 120 dpi.
+    // To solve the problem we use values in points (1 pixel = 0.75 point).
+    // resource: https://www.hteumeuleu.com/2021/background-properties-in-vml/
+    const buttonAttrOutlook = {
+        width: (buttonAttr.width + buttonAttr.iconWidth) * 0.75,
+        height: buttonAttr.height * 0.75 + 1,
+        iconWidth: buttonAttr.iconWidth * 0.75
+    };
 
     return (`
          <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 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;">
+                    <td width="16" height="${buttonAttr.height}"></td>
+                    <td class=${className} background=${iconUrl} bgcolor="${textColor}" width="${buttonAttr.iconWidth}" height="${buttonAttr.height}" 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:rect xmlns:v="urn:schemas-microsoft-com:vml" fill="true" stroke="false" style="width:${buttonAttrOutlook.iconWidth}pt;height:${buttonAttrOutlook.height}pt;">
                             <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>
+                            <a style="background-color: ${bgColor};border: none; width: ${buttonAttr.iconWidth}px; height: ${buttonAttr.height}px; display: block" href=${href} target="_blank"></a>
                         </div>
                         <!--[if gte mso 9]>
                         </v:textbox>
@@ -80,7 +94,7 @@ function getButtonHtml(href, buttonText, accentColor, className, iconUrl) {
                     </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">
+                            <v:rect xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="urn:schemas-microsoft-com:office:word" href=${href} style="height:${buttonAttrOutlook.height}pt;v-text-anchor:middle;width:${buttonAttrOutlook.width}pt;" stroke="f">
                                 <w:anchorlock/>
                                 <center>
                             <![endif]-->

package/core/server/services/mega/post-email-serializer.js

@@ -47,7 +47,10 @@ const PostEmailSerializer = {
 
         // Fix any unsupported chars in Outlook
         juicedHtml = juicedHtml.replace(/'/g, ''');
-
+        juicedHtml = juicedHtml.replace(/→/g, '→');
+        juicedHtml = juicedHtml.replace(/–/g, '–');
+        juicedHtml = juicedHtml.replace(/“/g, '“');
+        juicedHtml = juicedHtml.replace(/”/g, '”');
         return juicedHtml;
     },
 
@@ -392,12 +395,17 @@ const PostEmailSerializer = {
         if (!options.isBrowserPreview && !options.isTestEmail && settingsCache.get('email_track_clicks')) {
             result.html = await linkReplacer.replace(result.html, async (url) => {
                 // Add newsletter source attribution
-                url = memberAttribution.service.addEmailSourceAttributionTracking(url, newsletter);
                 const isSite = urlUtils.isSiteUrl(url);
 
                 if (isSite) {
+                    // Add newsletter name as ref to the URL
+                    url = memberAttribution.service.addEmailSourceAttributionTracking(url, newsletter);
+
                     // Only add post attribution to our own site (because external sites could/should not process this information)
                     url = memberAttribution.service.addPostAttributionTracking(url, post);
+                } else {
+                    // Add email source attribution without the newsletter name
+                    url = memberAttribution.service.addEmailSourceAttributionTracking(url);
                 }
 
                 // Add link click tracking

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

@@ -40,7 +40,8 @@ class MemberAttributionServiceWrapper {
                 Integration: models.Integration
             },
             attributionBuilder: this.attributionBuilder,
-            getTrackingEnabled: () => !!settingsCache.get('members_track_sources')
+            getTrackingEnabled: () => !!settingsCache.get('members_track_sources'),
+            getSiteTitle: () => settingsCache.get('title')
         });
     }
 }

package/core/server/web/members/app.js

@@ -34,7 +34,7 @@ module.exports = function setupMembersApp() {
     membersApp.post('/webhooks/stripe', bodyParser.raw({type: 'application/json'}), stripeService.webhookController.handle.bind(stripeService.webhookController));
 
     // Initializes members specific routes as well as assigns members specific data to the req/res objects
-    // We don't want to add global bodyParser middleware as that interfers with stripe webhook requests on - `/webhooks`.
+    // We don't want to add global bodyParser middleware as that interferes with stripe webhook requests on - `/webhooks`.
 
     // Manage newsletter subscription via unsubscribe link
     membersApp.get('/api/member/newsletters', middleware.getMemberNewsletters);