ghost 5.32.0 → 5.33.0

package/core/built/admin/assets/img/stripe-3af79c77413d7e58d0322c1de5bfdb8e.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 400 400" style="enable-background:new 0 0 400 400" xml:space="preserve"><path style="fill-rule:evenodd;clip-rule:evenodd;fill:#635bff" d="M0 0h400v400H0z"/><path d="M184.4 155.5c0-9.4 7.7-13.1 20.5-13.1 18.4 0 41.6 5.6 60 15.5v-56.8C244.8 93.1 225 90 205 90c-49.1 0-81.7 25.6-81.7 68.4 0 66.7 91.9 56.1 91.9 84.9 0 11.1-9.7 14.7-23.2 14.7-20.1 0-45.7-8.2-66-19.3v57.5c22.5 9.7 45.2 13.8 66 13.8 50.3 0 84.9-24.9 84.9-68.2-.4-72-92.5-59.2-92.5-86.3z" style="fill-rule:evenodd;clip-rule:evenodd;fill:#fff"/></svg>

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.32%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.33%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="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-721a7adc4ca642c88e4ac85e1cb8b385.css" title="light">
+    <link integrity="" rel="stylesheet" href="assets/ghost-fb9fb8adbcaf1603ad4006dd2d49e401.css" title="light">
 
     
 </head>
@@ -57,8 +57,8 @@
     <div id="ember-basic-dropdown-wormhole"></div>
 
     <script src="assets/vendor-0441964c34d58f2aacd5a04bbe240243.js"></script>
-<script src="assets/chunk.47.f231a64fe3fbaba23b84.js"></script>
-<script src="assets/chunk.143.ad05239cc363254caed7.js"></script>
-    <script src="assets/ghost-4571ad33bd158ced8a9f5c13598fdb7f.js"></script>
+<script src="assets/chunk.963.e47ead5abeca4cf69fed.js"></script>
+<script src="assets/chunk.143.e158db597c343f4f132e.js"></script>
+    <script src="assets/ghost-86f1db1d00d5f0bc4f0cbdb39ff6c977.js"></script>
 </body>
 </html>

package/core/cli/generate-data.js

@@ -1,5 +1,6 @@
 const Command = require('./command');
 const DataGenerator = require('@tryghost/data-generator');
+const config = require('../shared/config');
 
 module.exports = class REPL extends Command {
     setup() {
@@ -39,7 +40,8 @@ module.exports = class REPL extends Command {
                 fatal: this.fatal,
                 debug: this.debug
             },
-            modelQuantities: {}
+            modelQuantities: {},
+            baseUrl: config.getSiteUrl()
         });
         try {
             await dataGenerator.importData();

package/core/frontend/services/sitemap/base-generator.js

@@ -55,7 +55,7 @@ class BaseSiteMapGenerator {
         // Generate full xml
         let sitemapXml = localUtils.getDeclarations() + xml(data);
 
-        // Perform url transformatons
+        // Perform url transformations
         // - Necessary because sitemap data is supplied by the router which
         //   uses knex directly bypassing model-layer attribute transforms
         sitemapXml = urlUtils.transformReadyToAbsolute(sitemapXml);
@@ -63,6 +63,15 @@ class BaseSiteMapGenerator {
         return sitemapXml;
     }
 
+    updateURL(datum) {
+        const url = this.nodeLookup[datum.id]?.url[0].loc;
+
+        if (url) {
+            this.removeUrl(url, datum);
+            this.addUrl(url, datum);
+        }
+    }
+
     addUrl(url, datum) {
         const node = this.createUrlNodeFromDatum(url, datum);
 
@@ -100,6 +109,12 @@ class BaseSiteMapGenerator {
         }
     }
 
+    /**
+     *
+     * @param {String} url
+     * @param {Object} datum
+     * @returns
+     */
     createUrlNodeFromDatum(url, datum) {
         let node;
         let imgNode;

package/core/frontend/services/sitemap/manager.js

@@ -1,3 +1,5 @@
+const DomainEvents = require('@tryghost/domain-events');
+const {URLResourceUpdatedEvent} = require('@tryghost/dynamic-routing-events');
 const IndexMapGenerator = require('./index-generator');
 const PagesMapGenerator = require('./page-generator');
 const PostsMapGenerator = require('./post-generator');
@@ -29,6 +31,10 @@ class SiteMapManager {
             }
         });
 
+        DomainEvents.subscribe(URLResourceUpdatedEvent, (event) => {
+            this[event.data.resourceType].updateURL(event.data);
+        });
+
         events.on('url.added', (obj) => {
             this[obj.resource.config.type].addUrl(obj.url.absolute, obj.resource.data);
         });

package/core/server/services/email-analytics/jobs/index.js

@@ -7,7 +7,7 @@ const jobsService = require('../../jobs');
 let hasScheduled = false;
 
 module.exports = {
-    async scheduleRecurringJobs() {
+    async scheduleRecurringJobs(skipEmailCheck = false) {
         if (
             !hasScheduled &&
             config.get('emailAnalytics') &&
@@ -17,10 +17,10 @@ module.exports = {
             // Don't register email analytics job if we have no emails,
             // processor usage from many sites spinning up threads can be high.
             // Mega service will re-run this scheduling task when an email is sent
-            const emailCount = await models.Email
+            const emailCount = skipEmailCheck ? 1 : (await models.Email
                 .where('created_at', '>', moment.utc().subtract(30, 'days').toDate())
                 .where('status', '<>', 'failed')
-                .count();
+                .count());
 
             if (emailCount > 0) {
                 // use a random seconds value to avoid spikes to external APIs on the minute

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

@@ -35,6 +35,7 @@ class EmailServiceWrapper {
         const linkTracking = require('../link-tracking');
         const audienceFeedback = require('../audience-feedback');
         const storageUtils = require('../../adapters/storage/utils');
+        const emailAnalyticsJobs = require('../email-analytics/jobs');
 
         // capture errors from mailgun client and log them in sentry
         const errorHandler = (error) => {
@@ -103,7 +104,8 @@ class EmailServiceWrapper {
             emailSegmenter,
             limitService,
             membersRepository,
-            verificationTrigger: membersService.verificationTrigger
+            verificationTrigger: membersService.verificationTrigger,
+            emailAnalyticsJobs
         });
 
         this.controller = new EmailController(this.service, {

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

@@ -21,12 +21,17 @@ module.exports = class BookshelfMentionRepository {
     /** @type {Object} */
     #MentionModel;
 
+    /** @type {import('@tryghost/domain-events')} */
+    #DomainEvents;
+
     /**
      * @param {object} deps
      * @param {object} deps.MentionModel Bookshelf Model
+     * @param {import('@tryghost/domain-events')} deps.DomainEvents
      */
     constructor(deps) {
         this.#MentionModel = deps.MentionModel;
+        this.#DomainEvents = deps.DomainEvents;
     }
 
     #modelToMention(model) {
@@ -113,5 +118,8 @@ module.exports = class BookshelfMentionRepository {
                 id: data.id
             });
         }
+        for (const event of mention.events) {
+            this.#DomainEvents.dispatch(event);
+        }
     }
 };

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

@@ -0,0 +1,45 @@
+const ObjectID = require('bson-objectid').default;
+
+/**
+ * @typedef {import('@tryghost/webmentions/lib/MentionsAPI').IResourceService} IResourceService
+ */
+
+/**
+ * @implements {IResourceService}
+ */
+module.exports = class ResourceService {
+    /** @type {import('@tryghost/url-utils/lib/url-utils')} */
+    #urlUtils;
+
+    /** @type {import('../url')} */
+    #urlService;
+
+    /**
+     * @param {object} deps
+     * @param {import('@tryghost/url-utils/lib/url-utils')} deps.urlUtils
+     * @param {import('../url')} deps.urlService
+     */
+    constructor(deps) {
+        this.#urlUtils = deps.urlUtils;
+        this.#urlService = deps.urlService;
+    }
+
+    /**
+     * @param {URL} url
+     * @returns {Promise<import('@tryghost/webmentions/lib/MentionsAPI').ResourceResult>}
+     */
+    async getByURL(url) {
+        const path = this.#urlUtils.absoluteToRelative(url.href, {withoutSubdirectory: true});
+        const resource = this.#urlService.getResource(path);
+        if (resource?.config?.type === 'posts') {
+            return {
+                type: 'post',
+                id: ObjectID.createFromHexString(resource.data.id)
+            };
+        }
+        return {
+            type: null,
+            id: null
+        };
+    }
+};

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

@@ -0,0 +1,78 @@
+const logging = require('@tryghost/logging');
+
+/**
+ * @typedef {import('@tryghost/webmentions/lib/MentionsAPI').IRoutingService} IRoutingService
+ * @typedef {import('@tryghost/webmentions/lib/MentionsAPI').IResourceService} IResourceService
+ */
+
+/**
+ * @typedef {object} IUrlUtils
+ * @prop {() => string} getSiteUrl
+ * @prop {() => string} getSubdir
+ */
+
+/**
+ * @implements {IRoutingService}
+ */
+module.exports = class RoutingService {
+    /** @typedef {URL} */
+    #siteUrl;
+
+    /** @typedef {IResourceService} */
+    #resourceService;
+
+    /** @typedef {import('got')} */
+    #externalRequest;
+
+    /**
+     * @param {object} deps
+     * @param {URL} deps.siteUrl
+     * @param {IResourceService} deps.resourceService
+     * @param {import('got')} deps.externalRequest;
+     */
+    constructor(deps) {
+        this.#siteUrl = deps.siteUrl;
+        this.#resourceService = deps.resourceService;
+        this.#externalRequest = deps.externalRequest;
+    }
+
+    /**
+     * @param {URL} url
+     */
+    async pageExists(url) {
+        if (this.#siteUrl.origin !== url.origin) {
+            return false;
+        }
+        const subdir = removeTrailingSlash(this.#siteUrl.pathname);
+        if (subdir && !url.pathname.startsWith(subdir)) {
+            return false;
+        }
+
+        const resource = await this.#resourceService.getByURL(url);
+
+        if (resource?.type !== null) {
+            return true;
+        }
+
+        try {
+            const response = await this.#externalRequest.head(url, {
+                followRedirect: false
+            });
+            if (response.statusCode < 400 && response.statusCode > 199) {
+                return true;
+            } else {
+                return false;
+            }
+        } catch (err) {
+            logging.error(err);
+            return false;
+        }
+    }
+};
+
+/**
+ * @param {string} str
+ */
+function removeTrailingSlash(str) {
+    return str.replace(/\/$/, '');
+}

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

@@ -1,4 +1,3 @@
-const ObjectID = require('bson-objectid').default;
 const MentionController = require('./MentionController');
 const WebmentionMetadata = require('./WebmentionMetadata');
 const {
@@ -7,6 +6,8 @@ const {
     MentionDiscoveryService
 } = require('@tryghost/webmentions');
 const BookshelfMentionRepository = require('./BookshelfMentionRepository');
+const ResourceService = require('./ResourceService');
+const RoutingService = require('./RoutingService');
 const models = require('../../models');
 const events = require('../../lib/common/events');
 const externalRequest = require('../../../server/lib/request-external.js');
@@ -14,53 +15,39 @@ const urlUtils = require('../../../shared/url-utils');
 const outputSerializerUrlUtil = require('../../../server/api/endpoints/utils/serializers/output/utils/url');
 const labs = require('../../../shared/labs');
 const urlService = require('../url');
+const DomainEvents = require('@tryghost/domain-events');
 
 function getPostUrl(post) {
     const jsonModel = {};
     outputSerializerUrlUtil.forPost(post.id, jsonModel, {options: {}});
     return jsonModel.url;
 }
+
 module.exports = {
     controller: new MentionController(),
     async init() {
         const repository = new BookshelfMentionRepository({
-            MentionModel: models.Mention
+            MentionModel: models.Mention,
+            DomainEvents
         });
         const webmentionMetadata = new WebmentionMetadata();
         const discoveryService = new MentionDiscoveryService({externalRequest});
+        const resourceService = new ResourceService({
+            urlUtils,
+            urlService
+        });
+
+        const routingService = new RoutingService({
+            siteUrl: new URL(urlUtils.getSiteUrl()),
+            resourceService,
+            externalRequest
+        });
+
         const api = new MentionsAPI({
             repository,
             webmentionMetadata,
-            resourceService: {
-                async getByURL(url) {
-                    const path = urlUtils.absoluteToRelative(url.href, {withoutSubdirectory: true});
-                    const resource = urlService.getResource(path);
-                    if (resource?.config?.type === 'posts') {
-                        return {
-                            type: 'post',
-                            id: ObjectID.createFromHexString(resource.data.id)
-                        };
-                    }
-                    return {
-                        type: null,
-                        id: null
-                    };
-                }
-            },
-            routingService: {
-                async pageExists(url) {
-                    const siteUrl = new URL(urlUtils.getSiteUrl());
-                    if (siteUrl.origin !== url.origin) {
-                        return false;
-                    }
-                    const subdir = urlUtils.getSubdir();
-                    if (subdir && !url.pathname.startsWith(subdir)) {
-                        return false;
-                    }
-
-                    return true;
-                }
-            }
+            resourceService,
+            routingService
         });
 
         this.controller.init({api});

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

@@ -1,4 +1,6 @@
 const DomainEvents = require('@tryghost/domain-events');
+const labs = require('../../../shared/labs');
+
 class StaffServiceWrapper {
     init() {
         if (this.api) {
@@ -23,7 +25,8 @@ class StaffServiceWrapper {
             settingsHelpers,
             settingsCache,
             urlUtils,
-            DomainEvents
+            DomainEvents,
+            labs
         });
 
         this.api.subscribeEvents();

package/core/server/services/url/Resources.js

@@ -1,5 +1,7 @@
 const _ = require('lodash');
 const debug = require('@tryghost/debug')('services:url:resources');
+const DomainEvents = require('@tryghost/domain-events');
+const {URLResourceUpdatedEvent} = require('@tryghost/dynamic-routing-events');
 const Resource = require('./Resource');
 const config = require('../../../shared/config');
 const models = require('../../models');
@@ -272,6 +274,21 @@ class Resources {
         }
     }
 
+    /**
+     *
+     * @param {Object} model resource model
+     * @returns
+     */
+    _containsRoutingAffectingChanges(model, ignoredProperties) {
+        if (model._changed && Object.keys(model._changed).length) {
+            return _.difference(Object.keys(model._changed), ignoredProperties).length !== 0;
+        }
+
+        // NOTE: returning true here as "_changed" property might not be available on attached/detached events
+        //       assuming there were route affecting changes by default
+        return true;
+    }
+
     /**
      * @description Listener for "model updated" event.
      *
@@ -297,6 +314,22 @@ class Resources {
 
         const resourceConfig = _.find(this.resourcesConfig, {type: type});
 
+        // NOTE: check if any of the route-related fields were changed and only proceed if so
+        const ignoredProperties = [...resourceConfig.modelOptions.exclude, 'updated_at'];
+        if (!this._containsRoutingAffectingChanges(model, ignoredProperties)) {
+            const cachedResource = this.getByIdAndType(type, model.id);
+
+            if (cachedResource && model._changed && Object.keys(model._changed).includes('updated_at')) {
+                DomainEvents.dispatch(URLResourceUpdatedEvent.create(Object.assign(cachedResource.data, {
+                    resourceType: cachedResource.config.type,
+                    updated_at: model._changed.updated_at
+                })));
+            }
+
+            debug('skipping _onResourceUpdated because only non-route-related properties changed');
+            return false;
+        }
+
         // NOTE: synchronous handling for post and pages so that their URL is available without a delay
         //       for more context and future improvements check https://github.com/TryGhost/Ghost/issues/10360
         if (['posts', 'pages'].includes(type)) {

package/core/server/services/url/Urls.js

@@ -32,6 +32,9 @@ class Urls {
     /**
      * @description Add a url to the system.
      * @param {Object} options
+     * @param {import('./Resource')} options.resource - instance of the Resource class
+     * @param {string} options.generatorId
+     * @param {string} options.url
      */
     add(options) {
         const url = options.url;

package/core/server/services/url/config.js

@@ -31,7 +31,8 @@ module.exports = [
                 'twitter_title',
                 'twitter_description',
                 'custom_template',
-                'locale'
+                'locale',
+                'tiers'
             ],
             withRelated: ['tags', 'authors'],
             withRelatedPrimary: {
@@ -79,7 +80,8 @@ module.exports = [
                 'tags',
                 'authors',
                 'primary_tag',
-                'primary_author'
+                'primary_author',
+                'tiers'
             ],
             filter: 'status:published+type:page'
         },
@@ -126,7 +128,8 @@ module.exports = [
                 'accessibility',
                 'meta_title',
                 'meta_description',
-                'tour'
+                'tour',
+                'last_seen'
             ],
             filter: 'visibility:public',
             shouldHavePosts: {

package/core/shared/labs.js

@@ -35,6 +35,7 @@ const ALPHA_FEATURES = [
     'beforeAfterCard',
     'lexicalEditor',
     'webmentions',
+    'webmentionEmail',
     'outboundLinkTagging'
 ];