ghost 5.25.1 → 5.25.3

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-16dd31e7747e2dce6313f4362842b7b7.css" title="light">
+    <link integrity="" rel="stylesheet" href="assets/ghost-86cf21b24691d4fe9a73bcf84e5b36fe.css" title="light">
 
     
 </head>
@@ -56,9 +56,9 @@
 
     <div id="ember-basic-dropdown-wormhole"></div>
 
-    <script src="assets/vendor-a767da2d0322ba6e801e0d719ccf5a26.js"></script>
-<script src="assets/chunk.613.a29fe5699dd5f7fb05f1.js"></script>
-<script src="assets/chunk.143.0dc2fb34377630cd95b4.js"></script>
-    <script src="assets/ghost-a66ff073d219101414fa7b344095c1ca.js"></script>
+    <script src="assets/vendor-0d29a566ca9747f2cfba9d7c98e39f53.js"></script>
+<script src="assets/chunk.613.551c7c3e872b9a811863.js"></script>
+<script src="assets/chunk.143.37f5727f90df66ade091.js"></script>
+    <script src="assets/ghost-15f77300dbb6762873d6692e0485a37a.js"></script>
 </body>
 </html>

package/core/cli/record-test.js

@@ -1,46 +1,29 @@
 const {chromium} = require('@playwright/test');
 const Command = require('./command');
-const testUtils = require('../../test/utils');
+const playwrightConfig = require('../../playwright.config');
+const {globalSetup} = require('../../test/e2e-browser/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'];
+        return ['testing-browser'];
     }
 
-    async handle(argv) {
-        const app = await testUtils.startGhost();
-
-        if (argv.fixtures.length > 0) {
-            await testUtils.initFixtures(...argv.fixtures);
-        }
+    async handle() {
+        await globalSetup({
+            projects: [playwrightConfig]
+        });
 
         const browser = await chromium.launch({headless: false});
 
-        const baseURL = argv.admin ? `${app.url}ghost/` : app.url;
-        const context = await browser.newContext({
-            baseURL
-        });
+        const context = await browser.newContext(playwrightConfig.use);
 
         // 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.goto('/ghost');
 
         await page.pause();
     }

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

@@ -34,6 +34,7 @@ class EmailServiceWrapper {
         const linkReplacer = require('@tryghost/link-replacer');
         const linkTracking = require('../link-tracking');
         const audienceFeedback = require('../audience-feedback');
+        const storageUtils = require('../../adapters/storage/utils');
 
         // capture errors from mailgun client and log them in sentry
         const errorHandler = (error) => {
@@ -60,6 +61,7 @@ class EmailServiceWrapper {
             },
             imageSize: null,
             urlUtils,
+            storageUtils,
             getPostUrl: this.getPostUrl,
             linkReplacer,
             linkTracking,

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

@@ -1,4 +1,4 @@
-const {AbstractEmailSuppressionList, EmailSuppressionData} = require('@tryghost/email-suppression-list');
+const {AbstractEmailSuppressionList, EmailSuppressionData, EmailSuppressedEvent} = require('@tryghost/email-suppression-list');
 const {SpamComplaintEvent, EmailBouncedEvent} = require('@tryghost/email-events');
 const DomainEvents = require('@tryghost/domain-events');
 const logging = require('@tryghost/logging');
@@ -95,22 +95,27 @@ class MailgunEmailSuppressionList extends AbstractEmailSuppressionList {
     }
 
     async init() {
-        const handleEvent = async (event) => {
+        const handleEvent = reason => async (event) => {
             try {
                 await this.Suppression.add({
                     email_address: event.email,
                     email_id: event.emailId,
-                    reason: 'bounce',
+                    reason: reason,
                     created_at: event.timestamp
                 });
+                DomainEvents.dispatch(EmailSuppressedEvent.create({
+                    emailAddress: event.email,
+                    emailId: event.emailId,
+                    reason: reason
+                }, event.timestamp));
             } catch (err) {
                 if (err.code !== 'ER_DUP_ENTRY') {
                     logging.error(err);
                 }
             }
         };
-        DomainEvents.subscribe(EmailBouncedEvent, handleEvent);
-        DomainEvents.subscribe(SpamComplaintEvent, handleEvent);
+        DomainEvents.subscribe(EmailBouncedEvent, handleEvent('bounce'));
+        DomainEvents.subscribe(SpamComplaintEvent, handleEvent('spam'));
     }
 }
 

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

@@ -15,7 +15,6 @@ 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
@@ -564,15 +563,6 @@ async function createEmailBatches({emailModel, memberRows, memberSegment, option
     debug('createEmailBatches: storing recipient list');
     const startOfRecipientStorage = Date.now();
     let rowsToBatch = memberRows;
-    if (labs.isSet('suppressionList')) {
-        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;
-        });
-        rowsToBatch = filteredRows;
-    }
     const batches = _.chunk(rowsToBatch, bulkEmailService.BATCH_SIZE);
     const batchIds = await Promise.mapSeries(batches, storeRecipientBatch);
     debug(`createEmailBatches: stored recipient list (${Date.now() - startOfRecipientStorage}ms)`);

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

@@ -10,7 +10,7 @@ const mobiledocLib = require('../../lib/mobiledoc');
 const lexicalLib = require('../../lib/lexical');
 const htmlToPlaintext = require('@tryghost/html-to-plaintext');
 const membersService = require('../members');
-const {isUnsplashImage, isLocalContentImage} = require('@tryghost/kg-default-cards/lib/utils');
+const {isUnsplashImage} = require('@tryghost/kg-default-cards/lib/utils');
 const {textColorForBackgroundColor, darkenToContrastThreshold} = require('@tryghost/color-utils');
 const logging = require('@tryghost/logging');
 const urlService = require('../../services/url');
@@ -19,6 +19,7 @@ const linkTracking = require('../link-tracking');
 const memberAttribution = require('../member-attribution');
 const feedbackButtons = require('./feedback-buttons');
 const labs = require('../../../shared/labs');
+const storageUtils = require('../../adapters/storage/utils');
 
 const ALLOWED_REPLACEMENTS = ['first_name', 'uuid'];
 
@@ -261,7 +262,7 @@ const PostEmailSerializer = {
                         templateSettings.headerImageWidth = 600;
                     }
 
-                    if (isLocalContentImage(templateSettings.headerImage, urlUtils.getSiteUrl())) {
+                    if (storageUtils.isLocalImage(templateSettings.headerImage)) {
                         // we can safely request a 1200px image - Ghost will serve the original if it's smaller
                         templateSettings.headerImage = templateSettings.headerImage.replace(/\/content\/images\//, '/content/images/size/w1200/');
                     }
@@ -348,7 +349,7 @@ const PostEmailSerializer = {
                         post.feature_image_width = 600;
                     }
 
-                    if (isLocalContentImage(post.feature_image, urlUtils.getSiteUrl())) {
+                    if (storageUtils.isLocalImage(post.feature_image)) {
                         // we can safely request a 1200px image - Ghost will serve the original if it's smaller
                         post.feature_image = post.feature_image.replace(/\/content\/images\//, '/content/images/size/w1200/');
                     }

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

@@ -180,9 +180,10 @@ const updateMemberData = async function (req, res) {
                 id: member.id,
                 withRelated: ['stripeSubscriptions', 'stripeSubscriptions.customer', 'stripeSubscriptions.stripePrice', 'newsletters']
             };
-            const updatedMember = await membersService.api.members.update(data, options);
+            await membersService.api.members.update(data, options);
+            const updatedMember = await membersService.ssr.getMemberDataFromSession(req, res);
 
-            res.json(formattedMemberResponse(updatedMember.toJSON()));
+            res.json(formattedMemberResponse(updatedMember));
         } else {
             res.json(null);
         }

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

@@ -13,7 +13,8 @@ const settingsHelpers = require('../settings-helpers');
 async function configureApi() {
     const cfg = getConfig({settingsHelpers, config, urlUtils});
     if (cfg) {
-        cfg.testEnv = process.env.NODE_ENV.startsWith('test');
+        // @NOTE: to not start test mode when running playwright suite
+        cfg.testEnv = process.env.NODE_ENV.startsWith('test') && process.env.NODE_ENV !== 'testing-browser';
         await module.exports.configure(cfg);
         return true;
     }

package/core/shared/config/defaults.json

@@ -161,7 +161,7 @@
     },
     "portal": {
         "url": "https://cdn.jsdelivr.net/ghost/portal@~{version}/umd/portal.min.js",
-        "version": "2.20"
+        "version": "2.21"
     },
     "sodoSearch": {
         "url": "https://cdn.jsdelivr.net/ghost/sodo-search@~{version}/umd/sodo-search.min.js",

package/core/shared/config/env/config.development.json

@@ -22,5 +22,8 @@
         "admin": {
             "maxAge": 0
         }
+    },
+    "editor": {
+        "url": "http://127.0.0.1:4173/koenig-lexical.umd.js"
     }
 }

package/core/shared/config/env/config.testing-browser.json

@@ -0,0 +1,58 @@
+{
+    "url": "http://127.0.0.1:2369",
+    "database": {
+        "client": "sqlite3",
+        "connection": {
+            "filename": "/tmp/ghost-test.db"
+        },
+        "useNullAsDefault": true,
+        "debug": false
+    },
+    "server": {
+        "port": 2369
+    },
+    "logging": {
+        "level": "fatal"
+    },
+    "spam": {
+        "user_login": {
+            "minWait": 600000,
+            "maxWait": 604800000,
+            "freeRetries": 3
+        },
+        "user_reset": {
+            "minWait": 3600000,
+            "maxWait": 3600000,
+            "lifetime": 3600,
+            "freeRetries": 4
+        },
+        "global_reset": {
+            "minWait": 3600000,
+            "maxWait": 3600000,
+            "lifetime": 3600,
+            "freeRetries":4
+        },
+        "global_block": {
+            "minWait": 3600000,
+            "maxWait": 3600000,
+            "lifetime": 3600,
+            "freeRetries":4
+        },
+        "private_block": {
+            "minWait": 3600000,
+            "maxWait": 3600000,
+            "lifetime": 3600,
+            "freeRetries":99
+        }
+    },
+    "privacy": {
+        "useTinfoil": true,
+        "useStructuredData": true
+    },
+    "useMinFiles": false,
+    "paths": {
+        "fixtures": "test/utils/fixtures/fixtures",
+        "defaultSettings": "test/utils/fixtures/default-settings-browser.json",
+        "urlCache": "test/utils/fixtures/urls"
+    }
+}

package/core/shared/config/env/config.testing.json

@@ -54,10 +54,5 @@
         "fixtures": "test/utils/fixtures/fixtures",
         "defaultSettings": "test/utils/fixtures/default-settings.json",
         "urlCache": "test/utils/fixtures/urls"
-    },
-    "sodoSearch": {
-        "url": "https://cdn.jsdelivr.net/npm/@tryghost/sodo-search@~{version}/umd/sodo-search.min.js",
-        "styles": "https://cdn.jsdelivr.net/npm/@tryghost/sodo-search@~{version}/umd/main.css",
-        "version": "1.0"
     }
 }

package/core/shared/config/loader.js

@@ -30,7 +30,7 @@ function loadNconf(options) {
 
     // Now load various config json files
     nconf.file('custom-env', path.join(customConfigPath, 'config.' + env + '.json'));
-    if (env !== 'testing') {
+    if (!env.startsWith('testing')) {
         nconf.file('local-env', path.join(customConfigPath, 'config.local.json'));
     }
     nconf.file('default-env', path.join(baseConfigPath, 'env', 'config.' + env + '.json'));

package/core/shared/config/overrides.json

@@ -70,8 +70,8 @@
         }
     },
     "times": {
-        "cannotScheduleAPostBeforeInMinutes": 2,
-        "publishAPostBySchedulerToleranceInMinutes": 2,
+        "cannotScheduleAPostBeforeInMinutes": -2,
+        "publishAPostBySchedulerToleranceInMinutes": 5,
         "getImageSizeTimeoutInMS": 5000
     },
     "maintenance": {
@@ -86,7 +86,8 @@
             "w2400": {"width": 2400}
         },
         "internalImageSizes": {
-            "icon": {"width": 256, "height": 256}
+            "icon": {"width": 256, "height": 256},
+            "email-header-image": {"width": 1200}
         }
     }
 }

package/core/shared/sentry.js

@@ -10,6 +10,7 @@ if (sentryConfig && !sentryConfig.disabled) {
         dsn: sentryConfig.dsn,
         release: 'ghost@' + version,
         environment: environment,
+        maxValueLength: 1000,
         beforeSend: function (event, hint) {
             const exception = hint.originalException;