ghost 5.82.3 → 5.82.4

package/core/built/admin/assets/{vendor-f9bad0b8c0149699f84c0bd9d325068e.js → vendor-5ef343f0a55366497ef903095548a0d5.js}

@@ -7030,11 +7030,11 @@ if(h&&!1!==d.startTransactionOnPageLoad&&!1!==d.instrumentPageLoad){const r=e.re
 u=i(p,{name:`route:${r.name}`,origin:"auto.pageload.ember",attributes:{[t.SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]:"route"},tags:{url:h,toRoute:r.name,"routing.instrumentation":"@sentry/ember"}})}const f=(e,t)=>{t||(u?.end(),o().off("end",f))}
 !1===d.startTransactionOnLocationChange&&!1===d.instrumentNavigation||(e.on("routeWillChange",(r=>{const{fromRoute:n,toRoute:i}=function(e,t){const r=e?.from?.name
 return{fromRoute:r,toRoute:e?.to?.name||t.currentRouteName}}(r,e)
-u?.end(),u=s(p,{name:`route:${i}`,origin:"auto.navigation.ember",attributes:{[t.SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]:"route"},tags:{fromRoute:n,toRoute:i,"routing.instrumentation":"@sentry/ember"}}),c=(0,t.startInactiveSpan)({attributes:{[t.SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]:"auto.ui.ember"},op:"ui.ember.transition",name:`route:${n} -> route:${i}`})})),e.on("routeDidChange",(()=>{c&&u&&(c.end(),a?u.end():o().on("end",f))})))}function a(e,t){const n={payload:e,now:(0,r.timestampInSeconds)()}
+u?.end(),u=s(p,{name:`route:${i}`,origin:"auto.navigation.ember",attributes:{[t.SEMANTIC_ATTRIBUTE_SENTRY_SOURCE]:"route"},tags:{fromRoute:n,toRoute:i,"routing.instrumentation":"@sentry/ember"}}),c=(0,t.startInactiveSpan)({attributes:{[t.SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]:"auto.ui.ember"},op:"ui.ember.transition",name:`route:${n} -> route:${i}`,onlyIfParent:!0})})),e.on("routeDidChange",(()=>{c&&u&&(c.end(),a?u.end():o().on("end",f))})))}function a(e,t){const n={payload:e,now:(0,r.timestampInSeconds)()}
 t[e.object]=n}function l(e,n,i,o){const s=n[e.object]
 if(!s)return
 const a=(0,r.timestampInSeconds)()
-1e3*(a-s.now)>=o&&(0,t.startInactiveSpan)({name:e.containerKey||e.object,op:i,origin:"auto.ui.ember",startTimestamp:s.now})?.end(a)}function u(e){const n="@sentry/ember:initial-load-start",i="@sentry/ember:initial-load-end",{HAS_PERFORMANCE:o,HAS_PERFORMANCE_TIMING:s}=function(){const e=window.performance,t=Boolean(e&&e.clearMarks&&e.clearMeasures),n=Boolean(e.measure&&e.getEntriesByName&&void 0!==r.browserPerformanceTimeOrigin)
+1e3*(a-s.now)>=o&&(0,t.startInactiveSpan)({name:e.containerKey||e.object,op:i,origin:"auto.ui.ember",startTimestamp:s.now,onlyIfParent:!0})?.end(a)}function u(e){const n="@sentry/ember:initial-load-start",i="@sentry/ember:initial-load-end",{HAS_PERFORMANCE:o,HAS_PERFORMANCE_TIMING:s}=function(){const e=window.performance,t=Boolean(e&&e.clearMarks&&e.clearMeasures),n=Boolean(e.measure&&e.getEntriesByName&&void 0!==r.browserPerformanceTimeOrigin)
 return{HAS_PERFORMANCE:t,HAS_PERFORMANCE_TIMING:n}}()
 if(!o)return
 const{performance:a}=window
@@ -7043,7 +7043,7 @@ if(!s||void 0===r.browserPerformanceTimeOrigin)return
 const l="@sentry/ember:initial-load",u=a.getEntriesByName(n).length>0,c=a.getEntriesByName(i).length>0
 if(!u||!c)return
 a.measure(l,n,i)
-const d=a.getEntriesByName(l)[0],h=(d.startTime+r.browserPerformanceTimeOrigin)/1e3,p=h+d.duration/1e3;(0,t.startInactiveSpan)({op:"ui.ember.init",name:"init",attributes:{[t.SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]:"auto.ui.ember"},startTimestamp:h})?.end(p),a.clearMarks(n),a.clearMarks(i),a.clearMeasures(l)}async function c(e){const i=n(),c=i.browserTracingOptions||i.sentry.browserTracingOptions||{},{browserTracingIntegration:d,startBrowserTracingNavigationSpan:h,startBrowserTracingPageLoadSpan:p}=await emberAutoImportDynamic("@sentry/browser"),f=d({idleTimeout:i.transitionTimeout||5e3,...c,instrumentNavigation:!1,instrumentPageLoad:!1}),m=(0,t.getClient)()
+const d=a.getEntriesByName(l)[0],h=(d.startTime+r.browserPerformanceTimeOrigin)/1e3,p=h+d.duration/1e3;(0,t.startInactiveSpan)({op:"ui.ember.init",name:"init",attributes:{[t.SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]:"auto.ui.ember"},onlyIfParent:!0,startTimestamp:h})?.end(p),a.clearMarks(n),a.clearMarks(i),a.clearMeasures(l)}async function c(e){const i=n(),c=i.browserTracingOptions||i.sentry.browserTracingOptions||{},{browserTracingIntegration:d,startBrowserTracingNavigationSpan:h,startBrowserTracingPageLoadSpan:p}=await emberAutoImportDynamic("@sentry/browser"),f=d({idleTimeout:i.transitionTimeout||5e3,...c,instrumentNavigation:!1,instrumentPageLoad:!1}),m=(0,t.getClient)()
 m&&m.addIntegration&&m.addIntegration(f),function(e,t,r,n){const i=e.lookup("router:main")
 let o=e.lookup("service:router")
 o.externalRouter&&(o=o.externalRouter)
@@ -7057,7 +7057,7 @@ o().on("begin",((e,n)=>{if(n)return
 if(!(0,t.getActiveSpan)())return
 a&&a.end(),s=(0,r.timestampInSeconds)()
 const o=e=>{if(s){const n=(0,r.timestampInSeconds)()
-1e3*(n-s)>=(i??5)&&(0,t.startInactiveSpan)({attributes:{[t.SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]:"auto.ui.ember"},name:"runloop",op:`ui.ember.runloop.${e}`,startTimestamp:s})?.end(n),s=void 0}(0,t.getActiveSpan)()&&(s=(0,r.timestampInSeconds)())}
+1e3*(n-s)>=(i??5)&&(0,t.startInactiveSpan)({attributes:{[t.SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN]:"auto.ui.ember"},name:"runloop",op:`ui.ember.runloop.${e}`,startTimestamp:s,onlyIfParent:!0})?.end(n),s=void 0}(0,t.getActiveSpan)()&&(s=(0,r.timestampInSeconds)())}
 l.forEach((e=>{Ember.run.scheduleOnce(e,null,o,e)}))})),o().on("end",((e,t)=>{t||a&&(a.end(),a=void 0)}))}(i),function(e){const{disableInstrumentComponents:t,minimumComponentRenderDuration:r,enableComponentDefinitions:n}=e
 if(t)return
 const i=r??2,o={},s={}
@@ -9924,4 +9924,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-e2df5680ee343a169ab5cb0eec968016.map
+//# sourceMappingURL=vendor-5b3c871639e8269236f1a32144698b0d.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.82%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%2C%22editorFilename%22%3A%22koenig-lexical.umd.js%22%2C%22editorHash%22%3A%220bc388c18b%22%2C%22adminXDemoFilename%22%3A%22admin-x-demo.js%22%2C%22adminXDemoHash%22%3A%223e7af416ea%22%2C%22adminXSettingsFilename%22%3A%22admin-x-settings.js%22%2C%22adminXSettingsHash%22%3A%22dc1d300e0c%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.82%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%2C%22editorFilename%22%3A%22koenig-lexical.umd.js%22%2C%22editorHash%22%3A%22d4e7286cae%22%2C%22adminXDemoFilename%22%3A%22admin-x-demo.js%22%2C%22adminXDemoHash%22%3A%221338bf2f0d%22%2C%22adminXSettingsFilename%22%3A%22admin-x-settings.js%22%2C%22adminXSettingsHash%22%3A%227898cabecf%22%2C%22adminXActivitypubFilename%22%3A%22admin-x-activitypub.js%22%2C%22adminXActivitypubHash%22%3A%22f5c6e4344f%22%7D" />
 
     <meta name="HandheldFriendly" content="True" />
     <meta name="MobileOptimized" content="320" />
@@ -56,9 +56,9 @@
 
     <div id="ember-basic-dropdown-wormhole"></div>
 
-    <script src="assets/vendor-f9bad0b8c0149699f84c0bd9d325068e.js"></script>
-<script src="assets/chunk.682.9acd39e8ae4d98006602.js"></script>
-<script src="assets/chunk.524.7e89297e3fe4765e1581.js"></script>
-    <script src="assets/ghost-804748f2e71b6155946284e9658bddd0.js"></script>
+    <script src="assets/vendor-5ef343f0a55366497ef903095548a0d5.js"></script>
+<script src="assets/chunk.799.51e503059770581f528f.js"></script>
+<script src="assets/chunk.524.bd8238874f4b73f48c54.js"></script>
+    <script src="assets/ghost-0723ddb4afa369fc0303017c40ffffe0.js"></script>
 </body>
 </html>

package/core/server/services/Users.js

@@ -1,10 +1,13 @@
 // @ts-check
 const path = require('path');
+const ObjectId = require('bson-objectid').default;
 
 /**
  * @TODO: pass these in as dependencies
  */
 const {PostRevisions} = require('@tryghost/post-revisions');
+const DomainEvents = require('@tryghost/domain-events/lib/DomainEvents');
+const {PostsBulkAddTagsEvent} = require('@tryghost/post-events');
 
 /**
  * @typedef {Object} IdbBackup
@@ -76,8 +79,7 @@ class Users {
     }
 
     async assignTagToUserPosts({id, context, transacting}) {
-        // create an internal tag to assign to reassigned posts
-        // in following format: `#{author_slug}`
+        // get author slug
         const author = await this.models.User.findOne({
             id
         }, {
@@ -85,13 +87,27 @@ class Users {
             context,
             transacting
         });
+
+        // get list of posts that need the tag assigned
+        const userPosts = await this.models.Base.knex('posts_authors')
+            .transacting(transacting)
+            .where('author_id', id)
+            .select('post_id');
+        let usersPostIds = userPosts.map(p => p.post_id);
+
+        if (usersPostIds.length === 0) {
+            return;
+        }
+
+        // create an internal tag to assign to reassigned posts
+        // in following format: `#{author_slug}`
+        let createdTag = false;
         let tag = await this.models.Tag.findOne({
             slug: `hash-${author.get('slug')}`
         }, {
             context,
             transacting
         });
-
         if (!tag) {
             tag = await this.models.Tag.add({
                 slug: `#${author.get('slug')}`
@@ -99,45 +115,38 @@ class Users {
                 context,
                 transacting
             });
+            createdTag = true;
         }
 
-        const userPosts = await this.models.Base.knex('posts_authors')
-            .transacting(transacting)
-            .where('author_id', id)
-            .select('post_id');
-        const usersPostIds = userPosts.map(p => p.post_id);
-
-        // Add a tag to all posts that do not have the author tag yet
-        // NOTE: the method is implemented in an iterative way to avoid
-        //       memory consumption in case the user has thousands of posts
-        //       assigned to them. Also, didn't have any "bulk" way to add
-        //       a tag to multiple posts as the "sort_order" needs custom
-        //       logic to be run for each post.
-        //       Rewrite this bit if/when we hit a performance bottleneck here
-        for (const postId of usersPostIds) {
-            const post = await this.models.Post.findOne({
-                id: postId,
-                status: 'all'
-            }, {
-                id: postId,
-                withRelated: ['tags'],
-                context,
-                transacting
-            });
-
-            // check if tag already assigned to the post
-            const existingTagSlugs = post.relations.tags.models.map(t => t.get('slug'));
-
-            if (!existingTagSlugs.includes(tag.get('slug'))) {
-                await this.models.Post.edit({
-                    tags: [...post.relations.tags.models, tag]
-                }, {
-                    id: postId,
-                    context,
-                    transacting
-                });
-            }
+        // filter out posts that already have the tag if we didn't need to create one
+        if (!createdTag) {
+            const tagId = tag.get('id');
+            const taggedPostIds = await this.models.Base.knex('posts_tags')
+                .transacting(transacting)
+                .where('tag_id', tagId)
+                .select('post_id');
+            usersPostIds = userPosts
+                .map(p => p.post_id)
+                .filter(p => !taggedPostIds.includes(p));
         }
+
+        // assign tag to posts
+        //  do bulk insert for performance reasons
+        //  - go ahead and assign sort_order 0 to all of them
+        await this.models.Base.knex('posts_tags')
+            .transacting(transacting)
+            .insert(usersPostIds.map(postId => ({
+                id: (new ObjectId()).toHexString(),
+                post_id: postId,
+                tag_id: tag.get('id'),
+                sort_order: 0
+            })));
+
+        // manually add an entry in the Actions table that specifies the number of posts edited; see #bulkAddTags for similar logic
+        await this.models.Post.addActions('edited', usersPostIds, {transacting, context});
+
+        // dispatch event to ensure collections are updated
+        DomainEvents.dispatch(PostsBulkAddTagsEvent.create(usersPostIds));
     }
 
     /**
@@ -159,26 +168,29 @@ class Users {
         return this.models.Base.transaction(async (t) => {
             frameOptions.transacting = t;
 
+            // null author field for users' post revisions
             const postRevisions = new PostRevisions({
                 model: this.models.PostRevision
             });
-
             await postRevisions.removeAuthorFromRevisions(frameOptions.id, {
                 transacting: frameOptions.transacting
             });
 
+            // create a #author-slug tag and assign it to their posts
             await this.assignTagToUserPosts({
                 id: frameOptions.id,
                 context: frameOptions.context,
                 transacting: frameOptions.transacting
             });
 
+            // reassign posts to owner user
             await this.models.Post.reassignByAuthor({
                 id: frameOptions.id,
                 context: frameOptions.context,
                 transacting: frameOptions.transacting
             });
 
+            // delete user
             try {
                 await this.models.ApiKey.destroy({
                     ...frameOptions,

package/core/server/services/link-redirection/LinkRedirectRepository.js

@@ -1,27 +1,51 @@
 const LinkRedirect = require('@tryghost/link-redirects').LinkRedirect;
 const ObjectID = require('bson-objectid').default;
+const debug = require('@tryghost/debug')('LinkRedirectRepository');
 
 module.exports = class LinkRedirectRepository {
     /** @type {Object} */
     #LinkRedirect;
     /** @type {Object} */
     #urlUtils;
+    /** @type {Boolean} */
+    #cacheEnabled;
+    /** @type {Object} */
+    #cache;
 
     /**
      * @param {object} deps
-     * @param {object} deps.LinkRedirect Bookshelf Model
+     * @param {object} deps.LinkRedirect - Bookshelf Model
      * @param {object} deps.urlUtils
+     * @param {object} deps.cacheAdapter - Cache Adapter instance, or null if cache is disabled
+     * @param {object} deps.EventRegistry 
      */
     constructor(deps) {
+        debug('Creating LinkRedirectRepository');
         this.#LinkRedirect = deps.LinkRedirect;
         this.#urlUtils = deps.urlUtils;
+        this.#cache = null;
+        if (deps.cacheAdapter !== null) {
+            debug('Caching enabled with adapter:', deps.cacheAdapter.constructor.name);
+            this.#cache = deps.cacheAdapter;
+            // This is a bit of a blunt instrument, but it's the best we can do for now
+            // It covers all the cases we would need to invalidate the links cache
+            // We need to invalidate the cache when:
+            // - a redirect is edited
+            // - a site's subdirectory is changed (rare)
+            // - analytics settings are changed
+            deps.EventRegistry.on('site.changed', () => {
+                this.#cache.reset();
+            });
+        }
     }
 
     /**
+     * Save a new LinkRedirect to the DB
      * @param {InstanceType<LinkRedirect>} linkRedirect
      * @returns {Promise<void>}
      */
     async save(linkRedirect) {
+        debug('Saving link redirect', linkRedirect.from.pathname, '->', linkRedirect.to.href);
         const model = await this.#LinkRedirect.add({
             // Only store the pathname (no support for variable query strings)
             from: this.stripSubdirectoryFromPath(linkRedirect.from.pathname),
@@ -29,17 +53,31 @@ module.exports = class LinkRedirectRepository {
         }, {});
 
         linkRedirect.link_id = ObjectID.createFromHexString(model.id);
+        if (this.#cache) {
+            debug('Caching new link redirect', linkRedirect.from.pathname);
+            this.#cache.set(linkRedirect.from.pathname, this.#serialize(linkRedirect));
+        }
     }
 
+    /**
+     * Trim the leading slash from a URL path
+     * @param {string} url 
+     * @returns {string} url without leading slash
+     */
     #trimLeadingSlash(url) {
         return url.replace(/^\//, '');
     }
 
+    /**
+     * Returns a LinkRedirect object from a model
+     * @param {object} model - Bookshelf model instance 
+     * @returns {InstanceType<LinkRedirect>} LinkRedirect
+     */
     fromModel(model) {
         // Store if link has been edited
         // Note: in some edge cases updated_at is set directly after created_at, sometimes with a second difference, so we need to check for that
         const edited = model.get('updated_at')?.getTime() > (model.get('created_at')?.getTime() + 1000);
-
+        
         return new LinkRedirect({
             id: model.id,
             from: new URL(this.#trimLeadingSlash(model.get('from')), this.#urlUtils.urlFor('home', true)),
@@ -48,6 +86,43 @@ module.exports = class LinkRedirectRepository {
         });
     }
 
+    /**
+     * Create a LinkRedirect object from a JSON object (e.g. from the cache)
+     * @param {object} serialized
+     * @param {string} serialized.link_id - string representation of ObjectID
+     * @param {string} serialized.from - path of the URL
+     * @param {string} serialized.to - URL to redirect to
+     * @param {boolean} serialized.edited - whether the link has been edited
+     * @returns {InstanceType<LinkRedirect>} LinkRedirect
+     */
+    #fromSerialized(serialized) {
+        return new LinkRedirect({
+            id: serialized.link_id,
+            from: new URL(this.#trimLeadingSlash(serialized.from), this.#urlUtils.urlFor('home', true)),
+            to: new URL(serialized.to),
+            edited: serialized.edited
+        });
+    }
+
+    /**
+     * Serialize a LinkRedirect object to a plain object (e.g. for caching)
+     * @param {InstanceType<LinkRedirect>} linkRedirect 
+     * @returns {object} - serialized LinkRedirect
+     */
+    #serialize(linkRedirect) {
+        return {
+            link_id: linkRedirect.link_id.toHexString(),
+            from: linkRedirect.from.pathname,
+            to: linkRedirect.to.href,
+            edited: linkRedirect.edited
+        };
+    }
+
+    /**
+     * Get all LinkRedirects from the DB, with optional filters
+     * @param {object} options - options passed directly to LinkRedirect.findAll 
+     * @returns {Promise<InstanceType<LinkRedirect>[]>} array of LinkRedirects
+     */
     async getAll(options) {
         const collection = await this.#LinkRedirect.findAll(options);
 
@@ -60,6 +135,11 @@ module.exports = class LinkRedirectRepository {
         return result;
     }
 
+    /**
+     * Get all LinkRedirect IDs from the DB, with optional filters
+     * @param {object} options - options passed directly to LinkRedirect.getFilteredCollectionQuery
+     * @returns {Promise<string[]>} array of LinkRedirect IDs
+     */
     async getFilteredIds(options) {
         const linkRows = await this.#LinkRedirect.getFilteredCollectionQuery(options)
             .select('redirects.id')
@@ -68,25 +148,44 @@ module.exports = class LinkRedirectRepository {
     }
 
     /**
-     *
+     * Get a LinkRedirect by its URL
      * @param {URL} url
-     * @returns {Promise<InstanceType<LinkRedirect>|undefined>} linkRedirect
+     * @returns {Promise<InstanceType<LinkRedirect>|undefined>} LinkRedirect
      */
     async getByURL(url) {
+        debug('Getting link redirect for', url.pathname);
         // Strip subdirectory from path
         const from = this.stripSubdirectoryFromPath(url.pathname);
 
-        const linkRedirect = await this.#LinkRedirect.findOne({
+        if (this.#cache) {
+            const cachedLink = await this.#cache.get(from);
+            // Cache hit, serve from cache
+            if (cachedLink) {
+                debug('Cache hit for', from);
+                return this.#fromSerialized(cachedLink);
+            }
+        }
+
+        // Cache miss, fetch from the DB
+        const linkRedirectModel = await this.#LinkRedirect.findOne({
             from
         }, {});
 
-        if (linkRedirect) {
-            return this.fromModel(linkRedirect);
+        if (linkRedirectModel) {
+            const linkRedirect = this.fromModel(linkRedirectModel);
+            if (this.#cache) {
+                debug('Cache miss for', from, '. Caching');
+                // Cache the link
+                this.#cache.set(from, this.#serialize(linkRedirect));
+            }
+            return linkRedirect;
         }
     }
 
     /**
      * Convert root relative URLs to subdirectory relative URLs
+     * @param {string} path
+     * @returns {string} path without subdirectory
     */
     stripSubdirectoryFromPath(path) {
         // Bit weird, but only way to do it with the urlUtils atm

package/core/server/services/link-redirection/index.js

@@ -1,5 +1,8 @@
 const urlUtils = require('../../../shared/url-utils');
 const LinkRedirectRepository = require('./LinkRedirectRepository');
+const adapterManager = require('../adapter-manager');
+const config = require('../../../shared/config');
+const EventRegistry = require('../../lib/common/events');
 
 class LinkRedirectsServiceWrapper {
     async init() {
@@ -15,7 +18,9 @@ class LinkRedirectsServiceWrapper {
 
         this.linkRedirectRepository = new LinkRedirectRepository({
             LinkRedirect: models.Redirect,
-            urlUtils
+            urlUtils,
+            cacheAdapter: config.get('hostSettings:linkRedirectsPublicCache:enabled') ? adapterManager.getAdapter('cache:linkRedirectsPublic') : null,
+            EventRegistry
         });
 
         // Expose the service

package/core/server/services/xmlrpc.js

@@ -7,7 +7,6 @@ const tpl = require('@tryghost/tpl');
 const logging = require('@tryghost/logging');
 const request = require('@tryghost/request');
 const settingsCache = require('../../shared/settings-cache');
-const sentry = require('../../shared/sentry');
 
 // Used to receive post.published model event
 const events = require('../lib/common/events');
@@ -110,7 +109,6 @@ function ping(post) {
                     });
                 }
                 logging.error(error);
-                sentry.captureException(error);
             });
     });
 }

package/core/shared/labs.js

@@ -34,6 +34,8 @@ const BETA_FEATURES = [
     'additionalPaymentMethods',
     'i18n',
     'activitypub',
+    'internalLinking',
+    'stripeAutomaticTax',
     'webmentions'
 ];
 
@@ -43,7 +45,6 @@ const ALPHA_FEATURES = [
     'urlCache',
     'lexicalMultiplayer',
     'websockets',
-    'stripeAutomaticTax',
     'emailCustomization',
     'mailEvents',
     'collectionsCard',
@@ -52,8 +53,7 @@ const ALPHA_FEATURES = [
     'lexicalIndicators',
     // 'adminXOffers',
     'adminXDemo',
-    'membersSpamPrevention',
-    'internalLinking'
+    'membersSpamPrevention'
 ];
 
 module.exports.GA_KEYS = [...GA_FEATURES];