ghost 5.89.6 → 5.90.0

package/core/built/admin/assets/{vendor-eb806b4d193377b9b4bbf885840bfdc2.js → vendor-bff75d127fcf4a75c8a83b473bdb308f.js}

@@ -8782,7 +8782,7 @@ e.default={content:'<path stroke="currentColor" stroke-linecap="round" stroke-li
 Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
 e.default={content:'<defs><style>.labs_svg__a{fill:none;stroke:currentColor;stroke-linecap:round;stroke-linejoin:round;stroke-width:1.5px}</style></defs><path class="labs_svg__a" d="M6.726.75h10.5m-1.5 7.5V.75h-7.5v7.5L1.489 18.615A3 3 0 004 23.25h15.948a3 3 0 002.515-4.635zm-10.425 4.5h13.35m-4.425 4.5h3m-1.5-1.5v3"/><path class="labs_svg__a" d="M6.726 19.125a.375.375 0 01.374.375m-.749 0a.375.375 0 01.375-.375m0 .75a.375.375 0 01-.375-.375"/><path class="labs_svg__a" d="M7.1 19.5a.375.375 0 01-.375.375m3.001-3.75a.375.375 0 01.375.375m-.75 0a.375.375 0 01.375-.375m0 .75a.375.375 0 01-.375-.375"/><path class="labs_svg__a" d="M10.1 16.5a.375.375 0 01-.375.375M15.726 3.75h-3m3 3h-3"/>',attrs:{viewBox:"0 0 24 24"}}})),define("ember-svg-jar/inlined/link",["exports"],(function(e){"use strict"
 Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default={content:'<path stroke="currentColor" d="M14.5 12.5l.086.086a2 2 0 002.828 0l3.965-3.964a3.01 3.01 0 000-4.243l-1.758-1.757a3.008 3.008 0 00-4.242 0l-3.965 3.964a2 2 0 000 2.829l.086.085m-2 2l-.086-.085a2 2 0 00-2.828 0l-3.965 3.964a3.01 3.01 0 000 4.243l1.758 1.757a3.008 3.008 0 004.242 0l3.965-3.964a2 2 0 000-2.829L12.5 14.5m-4.389 1.389l7.778-7.778" fill="none"/>',attrs:{viewBox:"0 0 24 24"}}})),define("ember-svg-jar/inlined/lock-filled",["exports"],(function(e){"use strict"
+e.default={content:'<desc>Hyperlink 3 Streamline Icon: https://streamlinehq.com</desc><path d="M9.364 18.5l-.932.932a4.5 4.5 0 01-6.364-6.364l4.773-4.774a4.5 4.5 0 016.825 5.825" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/><path d="M14.818 5.567l.75-.75a4.5 4.5 0 016.364 6.364l-4.773 4.773a4.5 4.5 0 01-6.824-5.826" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5"/>',attrs:{viewBox:"0 0 24 24"}}})),define("ember-svg-jar/inlined/lock-filled",["exports"],(function(e){"use strict"
 Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
 e.default={content:'<path d="M19.5 9.5h-.75V6.75a6.75 6.75 0 00-13.5 0V9.5H4.5a2 2 0 00-2 2V22a2 2 0 002 2h15a2 2 0 002-2V11.5a2 2 0 00-2-2zm-7.5 9a2 2 0 112-2 2 2 0 01-2 2zM16.25 9a.5.5 0 01-.5.5h-7.5a.5.5 0 01-.5-.5V6.75a4.25 4.25 0 018.5 0z" fill="currentColor"/>',attrs:{viewBox:"0 0 24 24"}}})),define("ember-svg-jar/inlined/lock",["exports"],(function(e){"use strict"
 Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
@@ -9518,4 +9518,4 @@ e.default=class{constructor(e){if(this._data=new t.default,e)for(let t=0;t<e.len
 return this}get(e){let t=this._data[e]
 return t===r.UNDEFINED_KEY?void 0:t}set(e,t){return this._data[e]=t,this}delete(e){return this._data[e]=r.UNDEFINED_KEY,!0}}}))
 
-//# sourceMappingURL=vendor-a5396535c9254637f330cdc37337a070.map
+//# sourceMappingURL=vendor-a3242d3bb7bb2f2ad87cc8ba3d607097.map

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%22cdnUrl%22%3A%22%22%2C%22editorUrl%22%3A%22%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.89%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%2C%22editorFilename%22%3A%22koenig-lexical.umd.js%22%2C%22editorHash%22%3A%224e5636b008%22%2C%22adminXDemoFilename%22%3A%22admin-x-demo.js%22%2C%22adminXDemoHash%22%3A%2238e9a4d76a%22%2C%22adminXSettingsFilename%22%3A%22admin-x-settings.js%22%2C%22adminXSettingsHash%22%3A%2226cabffbea%22%2C%22adminXActivitypubFilename%22%3A%22admin-x-activitypub.js%22%2C%22adminXActivitypubHash%22%3A%224e8596d2e2%22%7D" />
+<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22cdnUrl%22%3A%22%22%2C%22editorUrl%22%3A%22%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.90%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%2C%22editorFilename%22%3A%22koenig-lexical.umd.js%22%2C%22editorHash%22%3A%224e5636b008%22%2C%22adminXDemoFilename%22%3A%22admin-x-demo.js%22%2C%22adminXDemoHash%22%3A%22b027d76bc5%22%2C%22adminXSettingsFilename%22%3A%22admin-x-settings.js%22%2C%22adminXSettingsHash%22%3A%2206c6b7a1d5%22%2C%22adminXActivitypubFilename%22%3A%22admin-x-activitypub.js%22%2C%22adminXActivitypubHash%22%3A%2261ea0f97da%22%7D" />
 
     <meta name="HandheldFriendly" content="True" />
     <meta name="MobileOptimized" content="320" />
@@ -37,7 +37,7 @@
     </style>
 
     <link integrity="" rel="stylesheet" href="assets/vendor-0ede59da8efb5e28fa929557f7ff7154.css">
-    <link integrity="" rel="stylesheet" href="assets/ghost-f627cc6acd7574a7bdbf2f2988365c78.css" title="light">
+    <link integrity="" rel="stylesheet" href="assets/ghost-e452bcc2710cf5a8372a7f7202661191.css" title="light">
 
     
 </head>
@@ -56,9 +56,9 @@
 
     <div id="ember-basic-dropdown-wormhole"></div>
 
-    <script src="assets/vendor-eb806b4d193377b9b4bbf885840bfdc2.js"></script>
-<script src="assets/chunk.42.90f279da5ca389af68b9.js"></script>
-<script src="assets/chunk.524.c121fa5c220befde8234.js"></script>
-    <script src="assets/ghost-532c38e4c3ecd17d68cdcc9fb58b9098.js"></script>
+    <script src="assets/vendor-bff75d127fcf4a75c8a83b473bdb308f.js"></script>
+<script src="assets/chunk.42.eae83e03ed76c8e8c57a.js"></script>
+<script src="assets/chunk.524.4551f9a844deaa462046.js"></script>
+    <script src="assets/ghost-e733775ba236c045dbcdaaa39231c6d8.js"></script>
 </body>
 </html>

package/core/frontend/services/routing/RouterManager.js

@@ -126,6 +126,13 @@ class RouterManager {
             this.registry.setRouter(staticRoutesRouter.identifier, staticRoutesRouter);
         });
 
+        _.each(routerSettings.taxonomies, (value, key) => {
+            const taxonomyRouter = new TaxonomyRouter(key, value, RESOURCE_CONFIG, this.routerCreated.bind(this));
+            this.siteRouter.mountRouter(taxonomyRouter.router());
+
+            this.registry.setRouter(taxonomyRouter.identifier, taxonomyRouter);
+        });
+
         _.each(routerSettings.collections, (value, key) => {
             const collectionRouter = new CollectionRouter(key, value, RESOURCE_CONFIG, this.routerCreated.bind(this));
             this.siteRouter.mountRouter(collectionRouter.router());
@@ -137,13 +144,6 @@ class RouterManager {
 
         this.registry.setRouter('staticPagesRouter', staticPagesRouter);
 
-        _.each(routerSettings.taxonomies, (value, key) => {
-            const taxonomyRouter = new TaxonomyRouter(key, value, RESOURCE_CONFIG, this.routerCreated.bind(this));
-            this.siteRouter.mountRouter(taxonomyRouter.router());
-
-            this.registry.setRouter(taxonomyRouter.identifier, taxonomyRouter);
-        });
-
         const appRouter = new ParentRouter('AppsRouter');
         this.siteRouter.mountRouter(appRouter.router());
 

package/core/frontend/src/cards/css/audio.css

@@ -9,7 +9,10 @@
     min-height: 96px;
     border-radius: 6px;
     padding: 4px;
+    background: #fff;
+    color: #222;
     box-shadow: inset 0 0 0 1px rgba(124, 139, 154, 0.25);
+    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
 }
 
 .kg-audio-card+.kg-audio-card {

package/core/frontend/src/cards/css/file.css

@@ -14,11 +14,14 @@
     color: inherit;
     padding: 12px;
     min-height: 92px;
+    background: #fff;
+    color: #222;
     border: 1px solid rgb(124 139 154 / 25%);
     border-radius: 5px;
     transition: all ease-in-out 0.35s;
     text-decoration: none;
     width: 100%;
+    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
 }
 
 .kg-file-card a.kg-file-card-container:hover {
@@ -137,4 +140,4 @@
 
 .kg-file-card + .kg-file-card {
     margin-top: 1em;
-}
+}

package/core/frontend/src/cards/css/product.css

@@ -19,8 +19,11 @@
     max-width: 550px;
     padding: 20px;
     width: 100%;
+    background: #fff;
+    color: #222;
     border-radius: 5px;
     box-shadow: inset 0 0 0 1px rgb(124 139 154 / 25%);
+    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
 }
 
 .kg-product-card-image {
@@ -34,7 +37,6 @@
 }
 
 .kg-product-card h4.kg-product-card-title {
-    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
     text-decoration: none;
     font-weight: 600;
     font-size: 21px;
@@ -50,7 +52,6 @@
 .kg-product-card .kg-product-card-description p,
 .kg-product-card .kg-product-card-description ol,
 .kg-product-card .kg-product-card-description ul {
-    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
     font-size: 14px;
     line-height: 1.5em;
     opacity: .7;
@@ -115,7 +116,6 @@
     display: flex;
     position: static;
     align-items: center;
-    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
     font-size: 14px;
     font-weight: 600;
     line-height: 1em;

package/core/frontend/src/cards/css/toggle.css

@@ -94,4 +94,4 @@
 
 .kg-toggle-card + .kg-toggle-card {
     margin-top: 1em;
-}
+}

package/core/server/data/migrations/versions/5.90/2024-08-20-09-40-24-update-default-donations-suggested-amount.js

@@ -0,0 +1,42 @@
+// For information on writing migrations, see https://www.notion.so/ghost/Database-migrations-eb5b78c435d741d2b34a582d57c24253
+
+const logging = require('@tryghost/logging');
+
+// For DDL - schema changes
+// const {createNonTransactionalMigration} = require('../../utils');
+
+// For DML - data changes
+const {createTransactionalMigration} = require('../../utils');
+
+// Or use a specific helper
+// const {addTable, createAddColumnMigration} = require('../../utils');
+
+module.exports = createTransactionalMigration(
+    async function up(knex) {
+        try {
+            // find the existing donations_suggested_amount setting
+            const existingSuggestedAmount = await knex('settings')
+                .where({key: 'donations_suggested_amount'})
+                .first();
+
+            // previous default is '0', if it's been set to something else we don't want to change it
+            if (existingSuggestedAmount.value !== '0') {
+                logging.info('donations_suggested_amount setting does not have previous default of 0, skipping migration');
+                return;
+            }
+
+            // new default is '500', update the setting
+            logging.info('Updating donations_suggested_amount default setting to 500');
+            await knex('settings')
+                .where({key: 'donations_suggested_amount'})
+                .update({value: '500'});
+        } catch (error) {
+            logging.error(`Error updating donations_suggested_amount setting: ${error.message}`);
+        }
+    },
+    async function down() {
+        // no-op
+        // we can't guarantee that a suggested amount of 500 now isn't
+        // something that was set explicitly
+    }
+);

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

@@ -567,7 +567,7 @@
             "type": "string"
         },
         "donations_suggested_amount": {
-            "defaultValue": 0,
+            "defaultValue": 500,
             "validations": {
                 "isEmpty": false
             },

package/core/server/models/base/plugins/crud.js

@@ -120,6 +120,20 @@ module.exports = function (Bookshelf) {
                 });
             }
 
+            if (Array.isArray(options.cte)) {
+                options.cte.forEach((cte) => {
+                    itemCollection.query((qb) => {
+                        qb.with(cte.name, qb.client.raw(cte.query));
+                    });
+                });
+            }
+
+            if (options.from) {
+                itemCollection.query((qb) => {
+                    qb.from(options.from);
+                });
+            }
+
             //option param to skip distinct from count query, distinct adds a lot of latency and in this case the result set will always be unique.
             if (unfilteredOptions.useBasicCount) {
                 options.useBasicCount = unfilteredOptions.useBasicCount;

package/core/server/models/member-click-event.js

@@ -21,7 +21,10 @@ const MemberClickEvent = ghostBookshelf.Model.extend({
         return expansions;
     },
 
-    filterRelations() {
+    filterRelations(options) {
+        if (options && options.filterRelations === false) {
+            return {};
+        }
         return {
             link: {
                 // Mongo-knex doesn't support belongsTo relations
@@ -47,7 +50,7 @@ const MemberClickEvent = ghostBookshelf.Model.extend({
     permittedOptions(methodName) {
         let options = ghostBookshelf.Model.permittedOptions.call(this, methodName);
         const validOptions = {
-            findPage: ['selectRaw', 'whereRaw']
+            findPage: ['selectRaw', 'whereRaw', 'cte', 'from', 'useCTE', 'filterRelations']
         };
 
         if (validOptions[methodName]) {

package/core/server/services/email-analytics/EmailAnalyticsServiceWrapper.js

@@ -57,11 +57,22 @@ class EmailAnalyticsServiceWrapper {
         });
     }
 
-    async fetchLatest({maxEvents} = {maxEvents: Infinity}) {
-        logging.info('[EmailAnalytics] Fetch latest started');
+    async fetchLatestOpenedEvents({maxEvents} = {maxEvents: Infinity}) {
+        logging.info('[EmailAnalytics] Fetch latest opened events started');
 
         const fetchStartDate = new Date();
-        const totalEvents = await this.service.fetchLatest({maxEvents});
+        const totalEvents = await this.service.fetchLatestOpenedEvents({maxEvents});
+        const fetchEndDate = new Date();
+
+        logging.info(`[EmailAnalytics] Fetched ${totalEvents} events and aggregated stats in ${fetchEndDate.getTime() - fetchStartDate.getTime()}ms (latest opens)`);
+        return totalEvents;
+    }
+
+    async fetchLatestNonOpenedEvents({maxEvents} = {maxEvents: Infinity}) {
+        logging.info('[EmailAnalytics] Fetch latest non-opened events started');
+
+        const fetchStartDate = new Date();
+        const totalEvents = await this.service.fetchLatestNonOpenedEvents({maxEvents});
         const fetchEndDate = new Date();
 
         logging.info(`[EmailAnalytics] Fetched ${totalEvents} events and aggregated stats in ${fetchEndDate.getTime() - fetchStartDate.getTime()}ms (latest)`);
@@ -69,7 +80,7 @@ class EmailAnalyticsServiceWrapper {
     }
 
     async fetchMissing({maxEvents} = {maxEvents: Infinity}) {
-        logging.info('[EmailAnalytics] Fetch missing started');
+        logging.info('[EmailAnalytics] Fetch missing events started');
 
         const fetchStartDate = new Date();
         const totalEvents = await this.service.fetchMissing({maxEvents});
@@ -83,7 +94,7 @@ class EmailAnalyticsServiceWrapper {
         if (maxEvents < 300) {
             return 0;
         }
-        logging.info('[EmailAnalytics] Fetch scheduled started');
+        logging.info('[EmailAnalytics] Fetch scheduled events started');
 
         const fetchStartDate = new Date();
         const totalEvents = await this.service.fetchScheduled({maxEvents});
@@ -100,13 +111,31 @@ class EmailAnalyticsServiceWrapper {
         }
         this.fetching = true;
 
+        // NOTE: Data shows we can process ~7500 events per minute on Pro; this can vary locally
         try {
-            const c1 = await this.fetchLatest({maxEvents: Infinity});
-            const c2 = await this.fetchMissing({maxEvents: Infinity});
+            // Prioritize opens since they are the most important (only data directly displayed to users)
+            await this.fetchLatestOpenedEvents({maxEvents: Infinity});
+
+            // Set limits on how much we fetch without checkings for opened events. During surge events (following newsletter send)
+            //  we want to make sure we don't spend too much time collecting delivery data.
+            const c1 = await this.fetchLatestNonOpenedEvents({maxEvents: 20000});
+            if (c1 > 15000) { 
+                this.fetching = false;
+                logging.info('[EmailAnalytics] Restarting fetch due to high event count');
+                this.startFetch();
+                return;
+            }
+            const c2 = await this.fetchMissing({maxEvents: 20000});
+            if ((c1 + c2) > 15000) {
+                this.fetching = false;
+                logging.info('[EmailAnalytics] Restarting fetch due to high event count');
+                this.startFetch();
+                return;
+            }
 
             // Only fetch scheduled if we didn't fetch a lot of normal events
             await this.fetchScheduled({maxEvents: 20000 - c1 - c2});
-
+            
             this.fetching = false;
         } catch (e) {
             logging.error(e, 'Error while fetching email analytics');

package/core/server/services/email-analytics/lib/queries.js

@@ -1,9 +1,14 @@
 const _ = require('lodash');
 const debug = require('@tryghost/debug')('services:email-analytics');
 const db = require('../../../data/db');
+const logging = require('@tryghost/logging');
+const {default: ObjectID} = require('bson-objectid');
 
 const MIN_EMAIL_COUNT_FOR_OPEN_RATE = 5;
 
+/** @typedef {'email-analytics-latest-opened'|'email-analytics-latest-others'|'email-analytics-missing'|'email-analytics-scheduled'} EmailAnalyticsJobName */
+/** @typedef {'delivered'|'opened'|'failed'} EmailAnalyticsEvent */
+
 module.exports = {
     async shouldFetchStats() {
         // don't fetch stats from Mailgun if we haven't sent any emails
@@ -11,35 +16,126 @@ module.exports = {
         return emailCount && emailCount.count > 0;
     },
 
-    async getLastSeenEventTimestamp() {
+    /**
+     * Retrieves the timestamp of the last seen event for the specified email analytics events.
+     * @param {EmailAnalyticsJobName} jobName - The name of the job to update.
+     * @param {EmailAnalyticsEvent[]} [events=['delivered', 'opened', 'failed']] - The email analytics events to consider.
+     * @returns {Promise<Date|null>} The timestamp of the last seen event, or null if no events are found.
+     */
+    async getLastEventTimestamp(jobName, events = ['delivered', 'opened', 'failed']) {
         const startDate = new Date();
-
-        // three separate queries is much faster than using max/greatest (with coalesce to handle nulls) across columns
-        let {maxDeliveredAt} = await db.knex('email_recipients').select(db.knex.raw('MAX(delivered_at) as maxDeliveredAt')).first() || {};
-        let {maxOpenedAt} = await db.knex('email_recipients').select(db.knex.raw('MAX(opened_at) as maxOpenedAt')).first() || {};
-        let {maxFailedAt} = await db.knex('email_recipients').select(db.knex.raw('MAX(failed_at) as maxFailedAt')).first() || {};
-
-        if (maxDeliveredAt && !(maxDeliveredAt instanceof Date)) {
-            // SQLite returns a string instead of a Date
-            maxDeliveredAt = new Date(maxDeliveredAt);
+        
+        let maxOpenedAt;
+        let maxDeliveredAt;
+        let maxFailedAt;
+
+        const jobData = await db.knex('jobs').select('finished_at', 'started_at').where('name', jobName).first();
+
+        if (jobData) {
+            debug(`Using job data for ${jobName}`);
+            const lastJobTimestamp = jobData.finished_at || jobData.started_at;
+            maxOpenedAt = events.includes('opened') ? lastJobTimestamp : null;
+            maxDeliveredAt = events.includes('delivered') ? lastJobTimestamp : null;
+            maxFailedAt = events.includes('failed') ? lastJobTimestamp : null;
+        } else {
+            debug(`Job data not found for ${jobName}, using email_recipients data`);
+            logging.info(`Job data not found for ${jobName}, using email_recipients data`);
+            if (events.includes('opened')) {
+                maxOpenedAt = (await db.knex('email_recipients').select(db.knex.raw('MAX(opened_at) as maxOpenedAt')).first()).maxOpenedAt;
+            }
+            if (events.includes('delivered')) {
+                maxDeliveredAt = (await db.knex('email_recipients').select(db.knex.raw('MAX(delivered_at) as maxDeliveredAt')).first()).maxDeliveredAt;
+            }
+            if (events.includes('failed')) {
+                maxFailedAt = (await db.knex('email_recipients').select(db.knex.raw('MAX(failed_at) as maxFailedAt')).first()).maxFailedAt;
+            }
+
+            // Insert a new job row if it doesn't exist
+            await db.knex('jobs').insert({
+                id: new ObjectID().toHexString(),
+                name: jobName,
+                started_at: new Date(),
+                created_at: new Date(),
+                status: 'started'
+            }).onConflict('name').ignore();
         }
 
-        if (maxOpenedAt && !(maxOpenedAt instanceof Date)) {
-            // SQLite returns a string instead of a Date
-            maxOpenedAt = new Date(maxOpenedAt);
-        }
-
-        if (maxFailedAt && !(maxFailedAt instanceof Date)) {
-            // SQLite returns a string instead of a Date
-            maxFailedAt = new Date(maxFailedAt);
-        }
+        // Convert string dates to Date objects for SQLite compatibility
+        [maxOpenedAt, maxDeliveredAt, maxFailedAt] = [maxOpenedAt, maxDeliveredAt, maxFailedAt].map(date => (
+            date && !(date instanceof Date) ? new Date(date) : date
+        ));
 
-        const lastSeenEventTimestamp = _.max([maxDeliveredAt, maxOpenedAt, maxFailedAt]);
+        const lastSeenEventTimestamp = _.max([maxOpenedAt, maxDeliveredAt, maxFailedAt]);
         debug(`getLastSeenEventTimestamp: finished in ${Date.now() - startDate}ms`);
 
         return lastSeenEventTimestamp;
     },
 
+    /**
+     * Sets the timestamp of the last seen event for the specified email analytics events.
+     * @param {EmailAnalyticsJobName} jobName - The name of the job to update.
+     * @param {'completed'|'started'} field - The field to update.
+     * @param {Date} date - The timestamp of the last seen event.
+     * @returns {Promise<void>}
+     * @description
+     * Updates the `finished_at` or `started_at` column of the specified job in the `jobs` table with the provided timestamp.
+     * This is used to keep track of the last time the job was run to avoid expensive queries following reboot.
+     */
+    async setJobTimestamp(jobName, field, date) {
+        // Convert string dates to Date objects for SQLite compatibility
+        try {
+            debug(`Setting ${field} timestamp for job ${jobName} to ${date}`);
+            const updateField = field === 'completed' ? 'finished_at' : 'started_at';
+            const status = field === 'completed' ? 'finished' : 'started';
+            const result = await db.knex('jobs').update({[updateField]: date, updated_at: new Date(), status: status}).where('name', jobName);
+            if (result === 0) {
+                await db.knex('jobs').insert({
+                    id: new ObjectID().toHexString(),
+                    name: jobName,
+                    [updateField]: date,
+                    updated_at: date,
+                    status: status
+                });
+            }
+        } catch (err) {
+            debug(`Error setting ${field} timestamp for job ${jobName}: ${err.message}`);
+        }
+    },
+
+    /**
+     * Sets the status of the specified email analytics job.
+     * @param {EmailAnalyticsJobName} jobName - The name of the job to update.
+     * @param {'started'|'finished'|'failed'} status - The new status of the job.
+     * @returns {Promise<void>}
+     * @description
+     * Updates the `status` column of the specified job in the `jobs` table with the provided status.
+     * This is used to keep track of the current state of the job.
+     */
+    async setJobStatus(jobName, status) {
+        debug(`Setting status for job ${jobName} to ${status}`);
+        try {
+            const result = await db.knex('jobs')
+                .update({
+                    status: status,
+                    updated_at: new Date()
+                })
+                .where('name', jobName);
+
+            if (result === 0) {
+                await db.knex('jobs').insert({
+                    id: new ObjectID().toHexString(),
+                    name: jobName,
+                    status: status,
+                    created_at: new Date(),
+                    updated_at: new Date()
+                });
+            }
+        } catch (err) {
+            debug(`Error setting status for job ${jobName}: ${err.message}`);
+            throw err;
+        }
+    },
+
     async aggregateEmailStats(emailId) {
         const {totalCount} = await db.knex('emails').select(db.knex.raw('email_count as totalCount')).where('id', emailId).first() || {totalCount: 0};
         // use IS NULL here because that will typically match far fewer rows than IS NOT NULL making the query faster
@@ -78,4 +174,4 @@ module.exports = {
             .update(updateQuery)
             .where('id', memberId);
     }
-};
+};

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

@@ -0,0 +1,62 @@
+const crypto = require('crypto');
+
+class RequestIntegrityTokenProvider {
+    #themeSecret;
+    #tokenDuration;
+
+    /**
+     * @param {object} options
+     * @param {string} options.themeSecret
+     * @param {number} options.tokenDuration - in milliseconds
+     */
+    constructor(options) {
+        this.#themeSecret = options.themeSecret;
+        this.#tokenDuration = options.tokenDuration;
+    }
+
+    /**
+     * @returns {string}
+     */
+    create() {
+        const currentTime = Date.now();
+        const expiryTime = currentTime + this.#tokenDuration;
+        const nonce = crypto.randomBytes(16).toString('hex');
+        const hmac = crypto.createHmac('sha256', this.#themeSecret);
+        hmac.update(`${expiryTime.toString()}:${nonce}`);
+        return `${expiryTime.toString()}:${nonce}:${hmac.digest('hex')}`;
+    }
+
+    /**
+     * @param {string} token
+     * @returns {boolean}
+     */
+    validate(token) {
+        const parts = token.split(':');
+        if (parts.length !== 3) {
+            // Invalid token string
+            return false;
+        }
+
+        const timestamp = parseInt(parts[0], 10);
+        const nonce = parts[1];
+        const hmacDigest = parts[2];
+
+        const hmac = crypto.createHmac('sha256', this.#themeSecret);
+        hmac.update(`${timestamp.toString()}:${nonce}`);
+        const expectedHmac = hmac.digest('hex');
+
+        if (expectedHmac !== hmacDigest) {
+            // HMAC mismatch
+            return false;
+        }
+
+        if (Date.now() > timestamp) {
+            // Token expired
+            return false;
+        }
+
+        return true;
+    }
+}
+
+module.exports = RequestIntegrityTokenProvider;

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

@@ -35,7 +35,7 @@ const getFreeTier = async function getFreeTier() {
  * @param {import('express').Request} req - The member object
  * @param {import('express').Response} res - The express response object to set the cookies on
  * @param {Object} freeTier - The free tier object
- * @returns 
+ * @returns
  */
 const setAccessCookies = function setAccessCookies(member, req, res, freeTier) {
     if (!member) {
@@ -157,6 +157,44 @@ const getIdentityToken = async function getIdentityToken(req, res) {
     }
 };
 
+const createIntegrityToken = async function createIntegrityToken(req, res) {
+    try {
+        const token = membersService.requestIntegrityTokenProvider.create();
+        res.writeHead(200);
+        res.end(token);
+    } catch (err) {
+        res.writeHead(204);
+        res.end();
+    }
+};
+
+const verifyIntegrityToken = async function verifyIntegrityToken(req, res, next) {
+    const shouldThrowForInvalidToken = config.get('verifyRequestIntegrity');
+    try {
+        const token = req.body.integrityToken;
+        if (!token) {
+            logging.warn('Request with missing integrity token.');
+            if (shouldThrowForInvalidToken) {
+                throw new errors.BadRequestError();
+            } else {
+                return next();
+            }
+        }
+        if (membersService.requestIntegrityTokenProvider.validate(token)) {
+            return next();
+        } else {
+            logging.warn('Request with invalid integrity token.');
+            if (shouldThrowForInvalidToken) {
+                throw new errors.BadRequestError();
+            } else {
+                return next();
+            }
+        }
+    } catch (err) {
+        next(err);
+    }
+};
+
 const deleteSession = async function deleteSession(req, res) {
     try {
         await membersService.ssr.deleteSession(req, res);
@@ -397,5 +435,7 @@ module.exports = {
     updateMemberNewsletters,
     deleteSession,
     accessInfoSession,
-    deleteSuppression
+    deleteSuppression,
+    createIntegrityToken,
+    verifyIntegrityToken
 };

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

@@ -19,6 +19,7 @@ const tiersService = require('../tiers');
 const VerificationTrigger = require('@tryghost/verification-trigger');
 const DatabaseInfo = require('@tryghost/database-info');
 const settingsHelpers = require('../settings-helpers');
+const RequestIntegrityTokenProvider = require('./RequestIntegrityTokenProvider');
 
 const messages = {
     noLiveKeysInDevelopment: 'Cannot use live stripe keys in development. Please restart in production mode.',
@@ -193,6 +194,11 @@ module.exports = {
     ssr: null,
     verificationTrigger: null,
 
+    requestIntegrityTokenProvider: new RequestIntegrityTokenProvider({
+        themeSecret: settingsCache.get('theme_session_secret'),
+        tokenDuration: 1000 * 60 * 5
+    }),
+
     stripeConnect: require('./stripe-connect'),
 
     processImport: null,