ghost 5.51.2 → 5.52.1

package/core/built/admin/assets/{vendor-bc3bd83c56b822ae56193b0d231189c0.js → vendor-2e4b0ccaa065f6709f955c29ec9e18a3.js}

@@ -14093,4 +14093,4 @@ return void 0===n&&(n=(0,t.createStorage)(null,(()=>!1)),r.set(e,n)),n}dirtyStor
 r&&(0,t.setValue)(r,null)}constructor(e){o(this,"storages",new WeakMap),o(this,"vals",void 0),this.vals=new WeakSet(e)}has(e){return(0,t.getValue)(this.storageFor(e)),this.vals.has(e)}add(e){return this.vals.add(e),this.dirtyStorageFor(e),this}delete(e){return this.dirtyStorageFor(e),this.vals.delete(e)}get[i](){return this.vals[Symbol.toStringTag]}}e.TrackedWeakSet=s,Object.setPrototypeOf(s.prototype,WeakSet.prototype)})),define("tracked-built-ins/index",["exports","tracked-built-ins/-private/decorator","tracked-built-ins/-private/array","tracked-built-ins/-private/object","tracked-built-ins/-private/map","tracked-built-ins/-private/set"],(function(e,t,r,n,i,o){"use strict"
 Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"TrackedArray",{enumerable:!0,get:function(){return r.default}}),Object.defineProperty(e,"TrackedMap",{enumerable:!0,get:function(){return i.TrackedMap}}),Object.defineProperty(e,"TrackedObject",{enumerable:!0,get:function(){return n.default}}),Object.defineProperty(e,"TrackedSet",{enumerable:!0,get:function(){return o.TrackedSet}}),Object.defineProperty(e,"TrackedWeakMap",{enumerable:!0,get:function(){return i.TrackedWeakMap}}),Object.defineProperty(e,"TrackedWeakSet",{enumerable:!0,get:function(){return o.TrackedWeakSet}}),Object.defineProperty(e,"tracked",{enumerable:!0,get:function(){return t.default}})}))
 
-//# sourceMappingURL=vendor-bc3bd83c56b822ae56193b0d231189c0.map
+//# sourceMappingURL=vendor-2e4b0ccaa065f6709f955c29ec9e18a3.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%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.51%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="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.52%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-e6482a0a19b228a9b9e71a9c5ea134ba.css" title="light">
+    <link integrity="" rel="stylesheet" href="assets/ghost-a99d4bf5c4a056624c1c41bbf7c06532.css" title="light">
 
     
 </head>
@@ -56,9 +56,9 @@
 
     <div id="ember-basic-dropdown-wormhole"></div>
 
-    <script src="assets/vendor-bc3bd83c56b822ae56193b0d231189c0.js"></script>
-<script src="assets/chunk.976.c3f393d6685c89bbaaca.js"></script>
-<script src="assets/chunk.143.a99b8ed3cb168269b0e3.js"></script>
-    <script src="assets/ghost-eea3f9036ed762e933a3a007d4d4909b.js"></script>
+    <script src="assets/vendor-2e4b0ccaa065f6709f955c29ec9e18a3.js"></script>
+<script src="assets/chunk.658.4548e702d296a29726d6.js"></script>
+<script src="assets/chunk.143.1106d36e1343f88742c0.js"></script>
+    <script src="assets/ghost-b73f018429dcbc18d6d47037187d6a81.js"></script>
 </body>
 </html>

package/core/frontend/helpers/ghost_head.js

@@ -89,8 +89,9 @@ function getSearchHelper(frontendKey) {
 
 function getAnnouncementBarHelper(data) {
     const preview = data?.site?._preview;
+    const isFilled = settingsCache.get('announcement_content') && settingsCache.get('announcement_visibility').length;
 
-    if (!settingsCache.get('announcement_content') && !preview) {
+    if (!isFilled && !preview) {
         return '';
     }
 

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

@@ -69,6 +69,10 @@
     object-position: center;
 }
 
+.kg-background-size-contain .kg-signup-card-image {
+    object-fit: contain;
+}
+
 .kg-signup-card-image.kg-style-accent {
     background-color: var(--ghost-accent-color);
 }

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

@@ -25,6 +25,25 @@ module.exports = {
         }
     },
 
+    browsePosts: {
+        headers: {
+            cacheInvalidate: false
+        },
+        data: [
+            'id'
+        ],
+        options: [
+            'limit',
+            'page'
+        ],
+        permissions: {
+            method: 'browse'
+        },
+        query(frame) {
+            return collectionsService.api.getAllPosts(frame.data.id, frame.options);
+        }
+    },
+
     read: {
         headers: {
             cacheInvalidate: false
@@ -96,47 +115,6 @@ module.exports = {
         }
     },
 
-    addPost: {
-        statusCode: 200,
-        headers: {
-            cacheInvalidate: false
-        },
-        options: [
-            'id'
-        ],
-        data: [
-            'post_id'
-        ],
-        validation: {
-            options: {
-                id: {
-                    required: true
-                }
-            },
-            data: {
-                post_id: {
-                    required: true
-                }
-            }
-        },
-        permissions: {
-            method: 'edit'
-        },
-        async query(frame) {
-            const collectionPost = await collectionsService.api.addPostToCollection(frame.options.id, {
-                id: frame.data.posts[0].id
-            });
-
-            if (!collectionPost) {
-                throw new errors.NotFoundError({
-                    message: tpl(messages.collectionNotFound)
-                });
-            }
-
-            return collectionPost;
-        }
-    },
-
     destroy: {
         statusCode: 204,
         headers: {
@@ -156,40 +134,5 @@ module.exports = {
         async query(frame) {
             return await collectionsService.api.destroy(frame.options.id);
         }
-    },
-
-    destroyPost: {
-        statusCode: 200,
-        headers: {
-            cacheInvalidate: true
-        },
-        options: [
-            'id',
-            'post_id'
-        ],
-        validation: {
-            options: {
-                id: {
-                    required: true
-                },
-                post_id: {
-                    required: true
-                }
-            }
-        },
-        permissions: {
-            method: 'edit'
-        },
-        async query(frame) {
-            const collection = await collectionsService.api.removePostFromCollection(frame.options.id, frame.options.post_id);
-
-            if (!collection) {
-                throw new errors.NotFoundError({
-                    message: tpl(messages.collectionNotFound)
-                });
-            }
-
-            return collection;
-        }
     }
 };

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

@@ -2,7 +2,7 @@ const models = require('../../models');
 const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 const getPostServiceInstance = require('../../services/posts/posts-service');
-const ALLOWED_INCLUDES = ['tags', 'authors', 'authors.roles', 'tiers', 'count.signups', 'count.paid_conversions'];
+const ALLOWED_INCLUDES = ['tags', 'authors', 'authors.roles', 'tiers', 'count.signups', 'count.paid_conversions', 'post_revisions', 'post_revisions.author'];
 const UNSAFE_ATTRS = ['status', 'authors', 'visibility'];
 
 const messages = {

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

@@ -1,3 +1,4 @@
+const urlUtils = require('../../../shared/url-utils');
 const models = require('../../models');
 const getPostServiceInstance = require('../../services/posts/posts-service');
 const allowedIncludes = [
@@ -21,6 +22,22 @@ const unsafeAttrs = ['status', 'authors', 'visibility'];
 
 const postsService = getPostServiceInstance();
 
+/**
+ * @param {string} event
+ */
+function getCacheHeaderFromEventString(event, dto) {
+    if (event === 'published_updated' || event === 'unpublished') {
+        return true;
+    }
+    if (event === 'scheduled_updated' || event === 'draft_updated') {
+        return {
+            value: urlUtils.urlFor({
+                relativeUrl: urlUtils.urlJoin('/p', dto.uuid, '/')
+            })
+        };
+    }
+}
+
 module.exports = {
     docName: 'posts',
     browse: {
@@ -31,6 +48,7 @@ module.exports = {
             'include',
             'filter',
             'fields',
+            'collection',
             'formats',
             'limit',
             'order',
@@ -52,7 +70,7 @@ module.exports = {
             unsafeAttrs: unsafeAttrs
         },
         query(frame) {
-            return models.Post.findPage(frame.options);
+            return postsService.browsePosts(frame.options);
         }
     },
 
@@ -162,6 +180,7 @@ module.exports = {
 
     edit: {
         headers: {
+            /** @type {boolean | {value: string}} */
             cacheInvalidate: false
         },
         options: [
@@ -194,9 +213,11 @@ module.exports = {
             unsafeAttrs: unsafeAttrs
         },
         async query(frame) {
-            let model = await postsService.editPost(frame);
-
-            this.headers.cacheInvalidate = postsService.handleCacheInvalidation(model);
+            let model = await postsService.editPost(frame, {
+                eventHandler: (event, dto) => {
+                    this.headers.cacheInvalidate = getCacheHeaderFromEventString(event, dto);
+                }
+            });
 
             return model;
         }

package/core/server/api/endpoints/utils/serializers/input/pages.js

@@ -24,7 +24,7 @@ function defaultRelations(frame) {
         return false;
     }
 
-    frame.options.withRelated = ['tags', 'authors', 'authors.roles', 'tiers', 'count.signups', 'count.paid_conversions'];
+    frame.options.withRelated = ['tags', 'authors', 'authors.roles', 'tiers', 'count.signups', 'count.paid_conversions', 'post_revisions', 'post_revisions.author'];
 }
 
 function setDefaultOrder(frame) {

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

@@ -0,0 +1,10 @@
+const collectionPostsMapper = require('./mappers/collection-posts');
+
+module.exports = {
+    browsePosts(response, apiConfig, frame) {
+        frame.response = {
+            collection_posts: response.data.map(model => collectionPostsMapper(model)),
+            meta: response.meta
+        };
+    }
+};

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

@@ -21,6 +21,10 @@ module.exports = {
         return require('./authentication');
     },
 
+    get collections() {
+        return require('./collections');
+    },
+
     get db() {
         return require('./db');
     },

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

@@ -0,0 +1,19 @@
+/**
+ *
+ * @param {import('@tryghost/collections').CollectionPostListItemDTO[]} collectionPosts[]
+ *
+ * @returns {SerializedCollectionPost}
+ */
+const mapper = (collectionPost) => {
+    return collectionPost;
+};
+
+/**
+ * @typedef {Object} SerializedCollectionPost
+ * @prop {string} id
+ * @prop {string} title
+ * @prop {string} slug
+ * @prop {string} feature_image
+ */
+
+module.exports = mapper;

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

@@ -46,6 +46,16 @@ module.exports = async (model, frame, options = {}) => {
 
     extraAttrs.forPost(frame.options, model, jsonModel);
 
+    const defaultFormats = ['html'];
+    const formatsToKeep = frame.options.formats || frame.options.columns || defaultFormats;
+
+    // Iterate over all known formats, and if they are not in the keep list, remove them
+    _.each(['mobiledoc', 'lexical', 'html', 'plaintext'], function (format) {
+        if (formatsToKeep.indexOf(format) === -1) {
+            delete jsonModel[format];
+        }
+    });
+
     // Attach tiers to custom nql visibility filter
     if (jsonModel.visibility) {
         if (['members', 'public'].includes(jsonModel.visibility) && jsonModel.tiers) {

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

@@ -78,6 +78,7 @@ const author = (attrs, frame) => {
 const post = (attrs, frame) => {
     const columns = frame && frame.options && frame.options.columns || null;
     const fields = frame && frame.original && frame.original.query && frame.original.query.fields || null;
+
     if (localUtils.isContentAPI(frame)) {
         delete attrs.status;
         delete attrs.email_only;

package/core/server/data/migrations/versions/5.21/2022-10-26-04-50-member-subscription-created-batch-id.js

@@ -3,6 +3,7 @@ const logging = require('@tryghost/logging');
 const ObjectId = require('bson-objectid').default;
 const {createTransactionalMigration} = require('../../utils');
 const DatabaseInfo = require('@tryghost/database-info');
+const GhostError = require('@tryghost/errors').GhostError;
 
 // This migration links together members_created_events and members_subscription_created_events
 
@@ -46,7 +47,9 @@ module.exports = createTransactionalMigration(
 
             if (response1[0] !== 0) {
                 logging.error(`Inserted ${response1[0]} members_created_events, expected 0`);
-                throw new Error('Rolling back');
+                throw new GhostError({
+                    message: 'Rolling back'
+                });
             }
 
             const response2 = await knex('members_subscription_created_events').insert(batch.map((r) => {
@@ -61,7 +64,9 @@ module.exports = createTransactionalMigration(
 
             if (response2[0] !== 0) {
                 logging.error(`Inserted ${response1[0]} members_subscription_created_events, expected 0`);
-                throw new Error('Rolling back');
+                throw new GhostError({
+                    message: 'Rolling back'
+                });
             }
         }
         logging.info(`Linked ${rows.length} members_created_events and members_subscription_created_events`);

package/core/server/data/migrations/versions/5.3/2022-07-06-09-26-add-ghost-explore-integration-api-key.js

@@ -14,7 +14,9 @@ module.exports = createTransactionalMigration(
         }).first();
 
         if (!integration) {
-            throw new InternalServerError('Could not find Ghost Explore Integration');
+            throw new InternalServerError({
+                message: 'Could not find Ghost Explore Integration'
+            });
         }
 
         const role = await knex('roles').where({
@@ -22,7 +24,9 @@ module.exports = createTransactionalMigration(
         }).first();
 
         if (!role) {
-            throw new InternalServerError('Could not find Ghost Explore Integration Role');
+            throw new InternalServerError({
+                message: 'Could not find Ghost Explore Integration Role'
+            });
         }
 
         const existingKey = await knex('api_keys').where({

package/core/server/data/migrations/versions/5.40/2023-03-21-19-02-add-self-serve-integration-api-key.js

@@ -14,7 +14,9 @@ module.exports = createTransactionalMigration(
         }).first();
 
         if (!integration) {
-            throw new InternalServerError('Could not find "Self-Serve Migration Integration"');
+            throw new InternalServerError({
+                message: 'Could not find "Self-Serve Migration Integration"'
+            });
         }
 
         const role = await knex('roles').where({
@@ -22,7 +24,9 @@ module.exports = createTransactionalMigration(
         }).first();
 
         if (!role) {
-            throw new InternalServerError('Could not find "Self-Serve Migration Integration" Role');
+            throw new InternalServerError({
+                message: 'Could not find "Self-Serve Migration Integration" Role'
+            });
         }
 
         const existingKey = await knex('api_keys').where({

package/core/server/data/migrations/versions/5.41/2023-03-27-17-51-fix-self-serve-integration-api-key-type.js

@@ -12,7 +12,9 @@ module.exports = module.exports = createTransactionalMigration(
         }).first();
 
         if (!integration) {
-            throw new InternalServerError('Could not find "Self-Serve Migration Integration"');
+            throw new InternalServerError({
+                message: 'Could not find "Self-Serve Migration Integration"'
+            });
         }
 
         const existingKey = await knex('api_keys').where({

package/core/server/models/post.js

@@ -997,6 +997,9 @@ Post = ghostBookshelf.Model.extend({
     /**
      * If the `formats` option is not used, we return `html` be default.
      * Otherwise we return what is requested e.g. `?formats=mobiledoc,plaintext`
+     *
+     * This method is only used by the raw-knex plugin.
+     * We have moved the logic into the serializers for the API.
      */
     formatsToJSON: function formatsToJSON(attrs, options) {
         const defaultFormats = ['html'];
@@ -1016,8 +1019,6 @@ Post = ghostBookshelf.Model.extend({
         const options = Post.filterOptions(unfilteredOptions, 'toJSON');
         let attrs = ghostBookshelf.Model.prototype.toJSON.call(this, options);
 
-        attrs = this.formatsToJSON(attrs, options);
-
         // CASE: never expose the mobiledoc revisions
         delete attrs.mobiledoc_revisions;
 

package/core/server/services/collections/PostsRepository.js

@@ -0,0 +1,39 @@
+class PostsRepository {
+    constructor({models, browsePostsAPI}) {
+        this.models = models;
+        this.browsePostsAPI = browsePostsAPI;
+    }
+
+    async getAll({filter}) {
+        const posts = await this.models.Post.findAll({
+            // @NOTE: enforce "post" type to avoid ever fetching pages
+            filter: `(${filter})+type:post`
+        });
+
+        return posts.toJSON();
+    }
+
+    async getBulk(ids) {
+        const response = await this.browsePostsAPI({
+            options: {
+                filter: `id:[${ids.join(',')}]+type:post`
+            }
+        });
+
+        return response.posts;
+    }
+}
+
+module.exports = PostsRepository;
+
+module.exports.getInstance = () => {
+    const models = require('../../models');
+    const browsePostsAPI = async (options) => {
+        const rawPosts = await require('../../api/').endpoints.posts.browse.query(options);
+        await require('../../api/').endpoints.serializers.output.posts.all(rawPosts, {}, options);
+
+        return options.response;
+    };
+
+    return new PostsRepository({models, browsePostsAPI});
+};

package/core/server/services/collections/index.js

@@ -2,28 +2,51 @@ const {
     CollectionsService,
     CollectionsRepositoryInMemory
 } = require('@tryghost/collections');
+const labs = require('../../../shared/labs');
 
 class CollectionsServiceWrapper {
     /** @type {CollectionsService} */
     api;
 
     constructor() {
-        const models = require('../../models');
-        const events = require('../../lib/common/events');
+        const postsRepository = require('./PostsRepository').getInstance();
         const collectionsRepositoryInMemory = new CollectionsRepositoryInMemory();
 
         const collectionsService = new CollectionsService({
             collectionsRepository: collectionsRepositoryInMemory,
-            postsRepository: {
-                getAll: async ({filter}) => {
-                    return models.Post.findAll({
-                        // @NOTE: enforce "post" type to avoid ever fetching pages
-                        filter: `(${filter})+type:post`
-                    });
-                }
-            }
+            postsRepository: postsRepository
         });
 
+        this.api = collectionsService;
+    }
+
+    async init() {
+        if (!labs.isSet('collections')) {
+            return;
+        }
+        const existingBuiltins = await this.api.getAll({filter: 'slug:featured'});
+
+        if (!existingBuiltins.data.length) {
+            await this.api.createCollection({
+                title: 'Index',
+                slug: 'index',
+                description: 'Collection with all posts',
+                type: 'automatic',
+                deletable: false,
+                filter: 'status:published'
+            });
+
+            await this.api.createCollection({
+                title: 'Featured Posts',
+                slug: 'featured',
+                description: 'Collection of featured posts',
+                type: 'automatic',
+                deletable: false,
+                filter: 'featured:true'
+            });
+        }
+
+        const events = require('../../lib/common/events');
         // @NOTE: these should be reworked to use the "Event" classes
         //        instead of Bookshelf model events
         const updateEvents = require('./update-events');
@@ -31,19 +54,7 @@ class CollectionsServiceWrapper {
         // @NOTE: naive update implementation to keep things simple for the first version
         for (const event of updateEvents) {
             events.on(event, () => {
-                collectionsService.updateAutomaticCollections();
-            });
-        }
-
-        this.api = collectionsService;
-    }
-
-    async init() {
-        const featuredCollections = await this.api.getAll({filter: 'slug:featured'});
-
-        if (!featuredCollections.data.length) {
-            require('./built-in-collections').forEach((collection) => {
-                this.api.createCollection(collection);
+                this.api.updateAutomaticCollections();
             });
         }
     }

package/core/server/services/segment/DomainEventsAnalytics.js

@@ -1,4 +1,5 @@
 const {MilestoneCreatedEvent} = require('@tryghost/milestones');
+const {StripeLiveEnabledEvent, StripeLiveDisabledEvent} = require('@tryghost/members-stripe-service').events;
 
 /**
  * @typedef {import('@tryghost/logging')} logging
@@ -75,9 +76,34 @@ module.exports = class DomainEventsAnalytics {
         }
     }
 
+    /**
+     *
+     * @param {StripeLiveEnabledEvent|StripeLiveDisabledEvent} type
+     *
+     * @returns {Promise<void>}
+     */
+    async #handleStripeEvent(type) {
+        const eventName = type === StripeLiveDisabledEvent ? 'Stripe Live Disabled' : 'Stripe Live Enabled';
+
+        try {
+            this.#analytics.track(Object.assign(this.#trackDefaults, {}, {event: this.#prefix + eventName}));
+        } catch (err) {
+            this.#logging.error(err);
+            this.#exceptionHandler.captureException(err);
+        }
+    }
+
     subscribeToEvents() {
         this.#DomainEvents.subscribe(MilestoneCreatedEvent, async (event) => {
             await this.#handleMilestoneCreatedEvent(event);
         });
+
+        this.#DomainEvents.subscribe(StripeLiveEnabledEvent, async () => {
+            await this.#handleStripeEvent(StripeLiveEnabledEvent);
+        });
+
+        this.#DomainEvents.subscribe(StripeLiveDisabledEvent, async () => {
+            await this.#handleStripeEvent(StripeLiveDisabledEvent);
+        });
     }
 };

package/core/server/services/settings/SettingsBREADService.js

@@ -208,6 +208,13 @@ class SettingsBREADService {
                 key: 'stripe_connect_account_id',
                 value: stripeConnectData.account_id
             });
+
+            if (stripeConnectData.public_key.match(/pk_live/)) {
+                // Require the Stripe service here as it breaks existing tests otherwise
+                const stripeService = require('../stripe');
+                // This method currently only triggers a DomainEvent
+                await stripeService.connect();
+            }
         }
 
         // remove any email properties that are not allowed to be set without verification

package/core/server/services/slack.js

@@ -153,7 +153,7 @@ function ping(post) {
     }
 }
 
-function listener(model, options) {
+function slackListener(model, options) {
     // CASE: do not ping slack if we import a database
     // TODO: refactor post.published events to never fire on importing
     if (options && options.importing) {
@@ -163,15 +163,20 @@ function listener(model, options) {
     ping(model.toJSON());
 }
 
-function testPing() {
+function slackTestPing() {
     ping({
         message: 'Heya! This is a test notification from your Ghost blog :smile:. Seems to work fine!'
     });
 }
 
 function listen() {
-    events.on('post.published', listener);
-    events.on('slack.test', testPing);
+    if (!events.hasRegisteredListener('post.published', 'slackListener')) {
+        events.on('post.published', slackListener);
+    }
+
+    if (!events.hasRegisteredListener('slack.test', 'slackTestPing')) {
+        events.on('slack.test', slackTestPing);
+    }
 }
 
 // Public API