ghost 5.34.1 → 5.35.1

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.34%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.35%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22ember-websockets%22%3A%7B%22socketIO%22%3Atrue%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-558c1e319d6e025bfab2054bc0f7fe83.css" title="light">
+    <link integrity="" rel="stylesheet" href="assets/ghost-1d4b69d04b8a97e8a1bd83ed5bb20777.css" title="light">
 
     
 </head>
@@ -56,9 +56,9 @@
 
     <div id="ember-basic-dropdown-wormhole"></div>
 
-    <script src="assets/vendor-253d6527ca6353855164ef65f896f762.js"></script>
-<script src="assets/chunk.616.181e1ad6c33f0bec7a65.js"></script>
-<script src="assets/chunk.143.07f5af56ff872bb0e9e4.js"></script>
-    <script src="assets/ghost-ad40d109653288e74a7cd922341fb33d.js"></script>
+    <script src="assets/vendor-c4684647d4f5213e5dbb6763de430e7e.js"></script>
+<script src="assets/chunk.502.c4afca88c98edad8b268.js"></script>
+<script src="assets/chunk.143.3e5760df9072a9463476.js"></script>
+    <script src="assets/ghost-5f530fdaca961aa2ec5c339d5bb13443.js"></script>
 </body>
 </html>

package/core/cli/generate-data.js

@@ -9,6 +9,7 @@ module.exports = class DataGeneratorCommand extends Command {
         this.argument('--scale', {type: 'string', defaultValue: 'small', desc: 'Scale of the data to generate. `small` for a quick run, `large` for more content'});
         this.argument('--single-table', {type: 'string', desc: 'Import a single table'});
         this.argument('--quantity', {type: 'number', desc: 'When importing a single table, the quantity to import'});
+        this.argument('--clear-database', {type: 'boolean', defaultValue: false, desc: 'Clear all entries in the database before importing'});
     }
 
     initializeContext(context) {
@@ -55,7 +56,8 @@ module.exports = class DataGeneratorCommand extends Command {
                 debug: this.debug
             },
             modelQuantities,
-            baseUrl: config.getSiteUrl()
+            baseUrl: config.getSiteUrl(),
+            clearDatabase: argv['clear-database']
         });
         try {
             if (argv['single-table']) {

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

@@ -4,6 +4,7 @@ const errors = require('@tryghost/errors');
 const megaService = require('../../services/mega');
 const emailService = require('../../services/email-service');
 const labs = require('../../../shared/labs');
+const emailAnalytics = require('../../services/email-analytics');
 
 const messages = {
     emailNotFound: 'Email not found.',
@@ -140,5 +141,39 @@ module.exports = {
             const filter = `email_id:'${frame.data.id}'` + (frame.options.filter ? `+(${frame.options.filter})` : '');
             return await models.EmailRecipientFailure.findPage({...frame.options, filter});
         }
+    },
+
+    analyticsStatus: {
+        permissions: {
+            method: 'browse'
+        },
+        async query() {
+            return emailAnalytics.service.getStatus();
+        }
+    },
+
+    scheduleAnalytics: {
+        permissions: {
+            method: 'browse'
+        },
+        data: [
+            'id'
+        ],
+        async query(frame) {
+            const model = await models.Email.findOne(frame.data, frame.options);
+            return emailAnalytics.service.schedule({
+                begin: model.get('created_at'),
+                end: new Date(Math.min(Date.now() - 60 * 60 * 1000, model.get('created_at').getTime() + 24 * 60 * 60 * 1000 * 7))
+            });
+        }
+    },
+
+    cancelScheduledAnalytics: {
+        permissions: {
+            method: 'browse'
+        },
+        async query() {
+            return emailAnalytics.service.cancelScheduled();
+        }
     }
 };

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

@@ -37,13 +37,20 @@ module.exports = {
                     ...frame.file,
                     path: out
                 });
-                const processedImagePath = store.urlToPath(processedImageUrl);
 
-                // Get the path and name of the processed image
-                // We want to store the original image on the same name + _o
-                // So we need to wait for the first store to finish before generating the name of the original image
-                const processedImageName = path.basename(processedImagePath);
-                const processedImageDir = path.dirname(processedImagePath);
+                let processedImageName = path.basename(processedImageUrl);
+                let processedImageDir = undefined;
+
+                if (store.urlToPath) {
+                    // Currently urlToPath is not part of StorageBase, so not all storage provider have implemented it
+                    const processedImagePath = store.urlToPath(processedImageUrl);
+
+                    // Get the path and name of the processed image
+                    // We want to store the original image on the same name + _o
+                    // So we need to wait for the first store to finish before generating the name of the original image
+                    processedImageName = path.basename(processedImagePath);
+                    processedImageDir = path.dirname(processedImagePath);
+                }
 
                 // Store the original image
                 await store.save({

package/core/server/api/endpoints/pages-public.js

@@ -1,6 +1,8 @@
 const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 const models = require('../../models');
+const postsPublicService = require('../../services/posts-public');
+
 const ALLOWED_INCLUDES = ['tags', 'authors', 'tiers'];
 
 const messages = {
@@ -34,7 +36,7 @@ module.exports = {
         },
         permissions: true,
         query(frame) {
-            return models.Post.findPage(frame.options);
+            return postsPublicService.api.browse(frame.options);
         }
     },
 

package/core/server/api/endpoints/posts-public.js

@@ -1,6 +1,8 @@
 const models = require('../../models');
 const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
+const postsPublicService = require('../../services/posts-public');
+
 const allowedIncludes = ['tags', 'authors', 'tiers', 'sentiment'];
 
 const messages = {
@@ -34,7 +36,7 @@ module.exports = {
         },
         permissions: true,
         query(frame) {
-            return models.Post.findPage(frame.options);
+            return postsPublicService.api.browse(frame.options);
         }
     },
 

package/core/server/api/endpoints/utils/serializers/output/emails.js

@@ -28,5 +28,9 @@ module.exports = {
         if (response.meta) {
             frame.response.meta = response.meta;
         }
+    },
+
+    analyticsStatus(response, apiConfig, frame) {
+        frame.response = response;
     }
 };

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

@@ -13,6 +13,7 @@ module.exports = (model) => {
         source_excerpt: json.sourceExcerpt,
         source_author: json.sourceAuthor,
         source_favicon: json.sourceFavicon,
-        source_featured_image: json.sourceFeaturedImage
+        source_featured_image: json.sourceFeaturedImage,
+        verified: json.verified
     };
 };

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

@@ -18,6 +18,8 @@ const getPostServiceInstance = require('../../../../../../services/posts/posts-s
 const postsService = getPostServiceInstance();
 
 const commentsService = require('../../../../../../services/comments');
+const memberAttribution = require('../../../../../../services/member-attribution');
+const labs = require('../../../../../../../shared/labs');
 
 module.exports = async (model, frame, options = {}) => {
     const {tiers: tiersData} = options || {};
@@ -65,6 +67,15 @@ module.exports = async (model, frame, options = {}) => {
         } else {
             jsonModel.comments = false;
         }
+
+        // Add  outbound link tags
+        if (labs.isSet('outboundLinkTagging')) {
+            // Only add it in the flag! Without the flag we only add it to emails.
+            if (jsonModel.html) {
+                // Only set if HTML was requested
+                jsonModel.html = await memberAttribution.outboundLinkTagger.addToHtml(jsonModel.html);
+            }
+        }
     }
 
     // Transforms post/page metadata to flat structure

package/core/server/data/migrations/versions/5.35/2023-02-13-06-24-add-mentions-verified-column.js

@@ -0,0 +1,7 @@
+const {createAddColumnMigration} = require('../../utils');
+
+module.exports = createAddColumnMigration('mentions', 'verified', {
+    type: 'boolean',
+    nullable: false,
+    defaultTo: false
+});

package/core/server/data/schema/schema.js

@@ -995,6 +995,7 @@ module.exports = {
         resource_type: {type: 'string', maxlength: 50, nullable: true},
         created_at: {type: 'dateTime', nullable: false},
         payload: {type: 'text', maxlength: 65535, nullable: true},
-        deleted: {type: 'boolean', nullable: false, defaultTo: false}
+        deleted: {type: 'boolean', nullable: false, defaultTo: false},
+        verified: {type: 'boolean', nullable: false, defaultTo: false}
     }
 };

package/core/server/lib/request-external.js

@@ -42,6 +42,7 @@ const externalRequest = got.extend({
     headers: {
         'user-agent': 'Ghost(https://github.com/TryGhost/Ghost)'
     },
+    timeout: 10000, // default is no timeout
     hooks: {
         init: [(options) => {
             if (!options.hostname || !validator.isURL(options.hostname)) {

package/core/server/models/mention.js

@@ -3,7 +3,8 @@ const ghostBookshelf = require('./base');
 const Mention = ghostBookshelf.Model.extend({
     tableName: 'mentions',
     defaults: {
-        deleted: false
+        deleted: false,
+        verified: false
     },
     enforcedFilters() {
         return 'deleted:false';

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

@@ -15,9 +15,24 @@ module.exports = {
         const startDate = new Date();
 
         // three separate queries is much faster than using max/greatest (with coalesce to handle nulls) across columns
-        const {maxDeliveredAt} = await db.knex('email_recipients').select(db.knex.raw('MAX(delivered_at) as maxDeliveredAt')).first() || {};
-        const {maxOpenedAt} = await db.knex('email_recipients').select(db.knex.raw('MAX(opened_at) as maxOpenedAt')).first() || {};
-        const {maxFailedAt} = await db.knex('email_recipients').select(db.knex.raw('MAX(failed_at) as maxFailedAt')).first() || {};
+        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);
+        }
+
+        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);
+        }
 
         const lastSeenEventTimestamp = _.max([maxDeliveredAt, maxOpenedAt, maxFailedAt]);
         debug(`getLastSeenEventTimestamp: finished in ${Date.now() - startDate}ms`);

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

@@ -1,5 +1,4 @@
 const logging = require('@tryghost/logging');
-const debug = require('@tryghost/debug')('jobs:email-analytics:fetch-latest');
 
 class EmailAnalyticsServiceWrapper {
     init() {
@@ -55,22 +54,40 @@ class EmailAnalyticsServiceWrapper {
         });
     }
 
-    async fetchLatest() {
+    async fetchLatest({maxEvents} = {maxEvents: Infinity}) {
+        logging.info('[EmailAnalytics] Fetch latest started');
+
         const fetchStartDate = new Date();
-        debug('Starting email analytics fetch of latest events');
-        const eventStats = await this.service.fetchLatest();
+        const totalEvents = await this.service.fetchLatest({maxEvents});
         const fetchEndDate = new Date();
-        debug(`Finished fetching ${eventStats.totalEvents} analytics events in ${fetchEndDate.getTime() - fetchStartDate.getTime()}ms`);
 
-        const aggregateStartDate = new Date();
-        debug(`Starting email analytics aggregation for ${eventStats.emailIds.length} emails`);
-        await this.service.aggregateStats(eventStats);
-        const aggregateEndDate = new Date();
-        debug(`Finished aggregating email analytics in ${aggregateEndDate.getTime() - aggregateStartDate.getTime()}ms`);
+        logging.info(`[EmailAnalytics] Fetched ${totalEvents} events and aggregated stats in ${fetchEndDate.getTime() - fetchStartDate.getTime()}ms (latest)`);
+        return totalEvents;
+    }
 
-        logging.info(`Fetched ${eventStats.totalEvents} events and aggregated stats for ${eventStats.emailIds.length} emails in ${aggregateEndDate.getTime() - fetchStartDate.getTime()}ms`);
+    async fetchMissing({maxEvents} = {maxEvents: Infinity}) {
+        logging.info('[EmailAnalytics] Fetch missing started');
 
-        return eventStats;
+        const fetchStartDate = new Date();
+        const totalEvents = await this.service.fetchMissing({maxEvents});
+        const fetchEndDate = new Date();
+
+        logging.info(`[EmailAnalytics] Fetched ${totalEvents} events and aggregated stats in ${fetchEndDate.getTime() - fetchStartDate.getTime()}ms (missing)`);
+        return totalEvents;
+    }
+
+    async fetchScheduled({maxEvents}) {
+        if (maxEvents < 300) {
+            return 0;
+        }
+        logging.info('[EmailAnalytics] Fetch scheduled started');
+
+        const fetchStartDate = new Date();
+        const totalEvents = await this.service.fetchScheduled({maxEvents});
+        const fetchEndDate = new Date();
+
+        logging.info(`[EmailAnalytics] Fetched ${totalEvents} events and aggregated stats in ${fetchEndDate.getTime() - fetchStartDate.getTime()}ms (scheduled)`);
+        return totalEvents;
     }
 
     async startFetch() {
@@ -80,12 +97,14 @@ class EmailAnalyticsServiceWrapper {
         }
         this.fetching = true;
 
-        logging.info('Email analytics fetch started');
         try {
-            const eventStats = await this.fetchLatest();
+            const c1 = await this.fetchLatest({maxEvents: Infinity});
+            const c2 = await this.fetchMissing({maxEvents: Infinity});
+
+            // Only fetch scheduled if we didn't fetch a lot of normal events
+            await this.fetchScheduled({maxEvents: 20000 - c1 - c2});
 
             this.fetching = false;
-            return eventStats;
         } catch (e) {
             logging.error(e, 'Error while fetching email analytics');
 

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

@@ -67,7 +67,8 @@ class EmailServiceWrapper {
             linkReplacer,
             linkTracking,
             memberAttributionService: memberAttribution.service,
-            audienceFeedbackService: audienceFeedback.service
+            audienceFeedbackService: audienceFeedback.service,
+            outboundLinkTagger: memberAttribution.outboundLinkTagger
         });
 
         const sendingService = new SendingService({

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

@@ -400,13 +400,13 @@ const PostEmailSerializer = {
 
                 if (isSite) {
                     // Add newsletter name as ref to the URL
-                    url = memberAttribution.service.addOutboundLinkTagging(url, newsletter);
+                    url = memberAttribution.outboundLinkTagger.addToUrl(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.addOutboundLinkTagging(url);
+                    url = memberAttribution.outboundLinkTagger.addToUrl(url);
                 }
 
                 // Add link click tracking

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

@@ -1041,7 +1041,7 @@ a[data-flickr-embed] img {
     }
 
     table.body .kg-bookmark-card {
-        width: 90vw !important;
+        width: 90vw;
     }
 
     table.body .kg-bookmark-thumbnail {

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

@@ -12,7 +12,7 @@ class MemberAttributionServiceWrapper {
 
         // Wire up all the dependencies
         const {
-            MemberAttributionService, UrlTranslator, ReferrerTranslator, AttributionBuilder
+            MemberAttributionService, UrlTranslator, ReferrerTranslator, AttributionBuilder, OutboundLinkTagger
         } = require('@tryghost/member-attribution');
         const models = require('../../models');
 
@@ -33,6 +33,12 @@ class MemberAttributionServiceWrapper {
 
         this.attributionBuilder = new AttributionBuilder({urlTranslator, referrerTranslator});
 
+        this.outboundLinkTagger = new OutboundLinkTagger({
+            isEnabled: () => !labs.isSet('outboundLinkTagging') || !!settingsCache.get('outbound_link_tagging'),
+            getSiteTitle: () => settingsCache.get('title'),
+            urlUtils
+        });
+
         // Expose the service
         this.service = new MemberAttributionService({
             models: {
@@ -41,9 +47,7 @@ class MemberAttributionServiceWrapper {
                 Integration: models.Integration
             },
             attributionBuilder: this.attributionBuilder,
-            getTrackingEnabled: () => !!settingsCache.get('members_track_sources'),
-            getOutboundLinkTaggingEnabled: () => !labs.isSet('outboundLinkTagging') || !!settingsCache.get('outbound_link_tagging'),
-            getSiteTitle: () => settingsCache.get('title')
+            getTrackingEnabled: () => !!settingsCache.get('members_track_sources')
         });
     }
 }

package/core/server/services/mentions/BookshelfMentionRepository.js

@@ -54,7 +54,8 @@ module.exports = class BookshelfMentionRepository {
             sourceAuthor: model.get('source_author'),
             sourceExcerpt: model.get('source_excerpt'),
             sourceFavicon: model.get('source_favicon'),
-            sourceFeaturedImage: model.get('source_featured_image')
+            sourceFeaturedImage: model.get('source_featured_image'),
+            verified: model.get('verified')
         });
     }
 
@@ -107,7 +108,8 @@ module.exports = class BookshelfMentionRepository {
             resource_id: mention.resourceId?.toHexString(),
             resource_type: mention.resourceId ? 'post' : null,
             payload: mention.payload ? JSON.stringify(mention.payload) : null,
-            deleted: Mention.isDeleted(mention)
+            deleted: Mention.isDeleted(mention),
+            verified: mention.verified
         };
 
         const existing = await this.#MentionModel.findOne({id: data.id}, {require: false});

package/core/server/services/mentions/WebmentionRequest.js

@@ -0,0 +1,20 @@
+const logging = require('@tryghost/logging');
+const oembedService = require('../oembed');
+
+module.exports = class WebmentionRequest {
+    /**
+     * @param {URL} url
+     * @returns {Promise<{html: string}>}
+     */
+    async fetch(url) {
+        try {
+            const data = await oembedService.fetchPageHtml(url.href);
+            return {
+                html: data.body
+            };
+        } catch (err) {
+            logging.warn(err);
+            return null;
+        }
+    }
+};

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

@@ -1,5 +1,6 @@
 const MentionController = require('./MentionController');
 const WebmentionMetadata = require('./WebmentionMetadata');
+const WebmentionRequest = require('./WebmentionRequest');
 const {
     MentionsAPI,
     MentionSendingService,
@@ -16,7 +17,7 @@ const outputSerializerUrlUtil = require('../../../server/api/endpoints/utils/ser
 const urlService = require('../url');
 const settingsCache = require('../../../shared/settings-cache');
 const DomainEvents = require('@tryghost/domain-events');
-const jobsService = require('../jobs');
+const jobsService = require('../mentions-jobs');
 
 function getPostUrl(post) {
     const jsonModel = {};
@@ -32,6 +33,7 @@ module.exports = {
             DomainEvents
         });
         const webmentionMetadata = new WebmentionMetadata();
+        const webmentionRequest = new WebmentionRequest();
         const discoveryService = new MentionDiscoveryService({externalRequest});
         const resourceService = new ResourceService({
             urlUtils,
@@ -47,6 +49,7 @@ module.exports = {
         const api = new MentionsAPI({
             repository,
             webmentionMetadata,
+            webmentionRequest,
             resourceService,
             routingService
         });

package/core/server/services/mentions-jobs/index.js

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

package/core/server/services/mentions-jobs/job-service.js

@@ -0,0 +1,48 @@
+/**
+ * Minimal wrapper around our external lib
+ * Intended for passing any Ghost internals such as logging and config
+ */
+
+const JobManager = require('@tryghost/job-manager');
+const logging = require('@tryghost/logging');
+const models = require('../../models');
+const sentry = require('../../../shared/sentry');
+const domainEvents = require('@tryghost/domain-events');
+
+const errorHandler = (error, workerMeta) => {
+    logging.info(`Capturing error for worker during execution of job: ${workerMeta.name}`);
+    logging.error(error);
+    sentry.captureException(error);
+};
+
+const workerMessageHandler = ({name, message}) => {
+    if (typeof message === 'string') {
+        logging.info(`Worker for job ${name} sent a message: ${message}`);
+    }
+};
+
+const initTestMode = () => {
+    // Output job queue length every 5 seconds
+    setInterval(() => {
+        logging.warn(`${jobManager.queue.length()} jobs in the queue. Idle: ${jobManager.queue.idle()}`);
+
+        const runningScheduledjobs = Object.keys(jobManager.bree.workers);
+        if (Object.keys(jobManager.bree.workers).length) {
+            logging.warn(`${Object.keys(jobManager.bree.workers).length} jobs running: ${runningScheduledjobs}`);
+        }
+
+        const scheduledJobs = Object.keys(jobManager.bree.intervals);
+        if (Object.keys(jobManager.bree.intervals).length) {
+            logging.warn(`${Object.keys(jobManager.bree.intervals).length} scheduled jobs: ${scheduledJobs}`);
+        }
+
+        if (runningScheduledjobs.length === 0 && scheduledJobs.length === 0) {
+            logging.warn('No scheduled or running jobs');
+        }
+    }, 5000);
+};
+
+const jobManager = new JobManager({errorHandler, workerMessageHandler, JobModel: models.Job, domainEvents});
+
+module.exports = jobManager;
+module.exports.initTestMode = initTestMode;

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

@@ -0,0 +1,78 @@
+const DomainEvents = require('@tryghost/domain-events');
+
+const getStripeLiveEnabled = () => {
+    const settingsCache = require('../../../shared/settings-cache');
+    const stripeConnect = settingsCache.get('stripe_connect_publishable_key');
+    const stripeKey = settingsCache.get('stripe_publishable_key');
+
+    const stripeLiveRegex = /pk_live_/;
+
+    if (stripeConnect && stripeConnect.match(stripeLiveRegex)) {
+        return true;
+    } else if (stripeKey && stripeKey.match(stripeLiveRegex)) {
+        return true;
+    }
+
+    return false;
+};
+
+module.exports = {
+    /** @type {import('@tryghost/milestones/lib/MilestonesService')} */
+    api: null,
+
+    /**
+     * @returns {Promise<void>}
+     */
+    async init() {
+        if (!this.api) {
+            const db = require('../../data/db');
+            const MilestoneQueries = require('./MilestoneQueries');
+
+            const {
+                MilestonesService,
+                InMemoryMilestoneRepository
+            } = require('@tryghost/milestones');
+            const config = require('../../../shared/config');
+            const milestonesConfig = config.get('milestones');
+
+            const repository = new InMemoryMilestoneRepository({DomainEvents});
+            const queries = new MilestoneQueries({db});
+
+            this.api = new MilestonesService({
+                repository,
+                milestonesConfig, // avoid using getters and pass as JSON
+                queries
+            });
+        }
+    },
+
+    /**
+     * @returns {Promise<object>}
+     */
+    async run() {
+        const labs = require('../../../shared/labs');
+
+        if (labs.isSet('milestoneEmails')) {
+            const members = await this.api.checkMilestones('members');
+            let arr;
+            const stripeLiveEnabled = getStripeLiveEnabled();
+
+            if (stripeLiveEnabled) {
+                arr = await this.api.checkMilestones('arr');
+            }
+
+            return {
+                members,
+                arr
+            };
+        }
+    },
+
+    /**
+     * @returns {Promise<object>}
+     */
+    async initAndRun() {
+        await this.init();
+        return await this.run();
+    }
+};

package/core/server/services/posts-public/index.js

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