ghost 5.99.0 → 5.100.0

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.99%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%2C%22editorFilename%22%3A%22koenig-lexical.umd.js%22%2C%22editorHash%22%3A%22a724a31dfe%22%2C%22adminXDemoFilename%22%3A%22admin-x-demo.js%22%2C%22adminXDemoHash%22%3A%22118f338ce4%22%2C%22adminXSettingsFilename%22%3A%22admin-x-settings.js%22%2C%22adminXSettingsHash%22%3A%2224993c916e%22%2C%22adminXActivitypubFilename%22%3A%22admin-x-activitypub.js%22%2C%22adminXActivitypubHash%22%3A%22f172caf7c8%22%2C%22adminXActivitypubCustomUrl%22%3A%22https%3A%2F%2Fcdn.jsdelivr.net%2Fghost%2Fadmin-x-activitypub%400%2Fdist%2Fadmin-x-activitypub.js%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.100%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%2C%22editorFilename%22%3A%22koenig-lexical.umd.js%22%2C%22editorHash%22%3A%22a724a31dfe%22%2C%22adminXDemoFilename%22%3A%22admin-x-demo.js%22%2C%22adminXDemoHash%22%3A%227b54e3e101%22%2C%22adminXSettingsFilename%22%3A%22admin-x-settings.js%22%2C%22adminXSettingsHash%22%3A%221b2f79bda3%22%2C%22adminXActivitypubFilename%22%3A%22admin-x-activitypub.js%22%2C%22adminXActivitypubHash%22%3A%22d3e0f0e348%22%2C%22adminXActivitypubCustomUrl%22%3A%22https%3A%2F%2Fcdn.jsdelivr.net%2Fghost%2Fadmin-x-activitypub%400%2Fdist%2Fadmin-x-activitypub.js%22%7D" />
 
     <meta name="HandheldFriendly" content="True" />
     <meta name="MobileOptimized" content="320" />
@@ -58,7 +58,7 @@
 
     <script src="assets/vendor-88cd9f5cf5eba65221e2d2a636531eaa.js"></script>
 <script src="assets/chunk.874.5eb920d19e75683234c2.js"></script>
-<script src="assets/chunk.524.85082593cb84282804e5.js"></script>
-    <script src="assets/ghost-fefa2e99b7dc389dfd6579049cdd2066.js"></script>
+<script src="assets/chunk.524.0982f6745ca0f52945b1.js"></script>
+    <script src="assets/ghost-7ab268fc7cd7884eef525145d5fbb501.js"></script>
 </body>
 </html>

package/core/frontend/helpers/ghost_head.js

@@ -62,7 +62,8 @@ function getMembersHelper(data, frontendKey, excludeList) {
             i18n: labs.isSet('i18n'),
             ghost: urlUtils.getSiteUrl(),
             key: frontendKey,
-            api: urlUtils.urlFor('api', {type: 'content'}, true)
+            api: urlUtils.urlFor('api', {type: 'content'}, true),
+            locale: settingsCache.get('locale') || 'en'
         };
         if (colorString) {
             attributes['accent-color'] = colorString;

package/core/server/api/endpoints/comments-members.js

@@ -109,7 +109,6 @@ const controller = {
         },
         options: [
             'include'
-
         ],
         validation: {
             options: {

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

@@ -1,28 +1,4 @@
 const logging = require('@tryghost/logging');
-const settings = require('../../../shared/settings-cache');
-const urlUtils = require('../../../shared/url-utils');
-const jwt = require('jsonwebtoken');
-const jose = require('node-jose');
-const issuer = urlUtils.urlFor('admin', true);
-
-const dangerousPrivateKey = settings.get('ghost_private_key');
-const keyStore = jose.JWK.createKeyStore();
-const keyStoreReady = keyStore.add(dangerousPrivateKey, 'pem');
-
-const getKeyID = async () => {
-    const key = await keyStoreReady;
-    return key.kid;
-};
-
-const sign = async (claims, options = {}) => {
-    const kid = await getKeyID();
-    return jwt.sign(claims, dangerousPrivateKey, Object.assign({
-        issuer,
-        expiresIn: '5m',
-        algorithm: 'RS256',
-        keyid: kid
-    }, options));
-};
 
 /** @type {import('@tryghost/api-framework').Controller} */
 const controller = {
@@ -33,6 +9,8 @@ const controller = {
         },
         permissions: true,
         async query(frame) {
+            const IdentityTokenService = require('../../services/identity-tokens');
+
             let role = null;
             try {
                 await frame.user.load(['roles']);
@@ -40,13 +18,9 @@ const controller = {
             } catch (err) {
                 logging.warn('Could not load role for identity');
             }
-            const claims = {
-                sub: frame.user.get('email')
-            };
-            if (typeof role === 'string') {
-                claims.role = role;
-            }
-            const token = await sign(claims);
+
+            const token = await IdentityTokenService.instance.getTokenForUser(frame.user.get('email'), role);
+
             return {token};
         }
     }

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

@@ -1,9 +1,12 @@
 const _ = require('lodash');
 const utils = require('../../..');
 const url = require('../utils/url');
+const htmlToPlaintext = require('@tryghost/html-to-plaintext');
 
 const commentFields = [
     'id',
+    'in_reply_to_id',
+    'in_reply_to_snippet',
     'status',
     'html',
     'created_at',
@@ -42,6 +45,10 @@ const countFields = [
 const commentMapper = (model, frame) => {
     const jsonModel = model.toJSON ? model.toJSON(frame.options) : model;
 
+    if (jsonModel.inReplyTo && jsonModel.inReplyTo.status === 'published') {
+        jsonModel.in_reply_to_snippet = htmlToPlaintext.commentSnippet(jsonModel.inReplyTo.html);
+    }
+
     const response = _.pick(jsonModel, commentFields);
 
     if (jsonModel.member) {
@@ -59,7 +66,7 @@ const commentMapper = (model, frame) => {
     }
 
     if (jsonModel.post) {
-        // We could use the post mapper here, but we need less field + don't need al the async behavior support
+        // We could use the post mapper here, but we need less field + don't need all the async behavior support
         url.forPost(jsonModel.post.id, jsonModel.post, frame);
         response.post = _.pick(jsonModel.post, postFields);
     }
@@ -77,7 +84,7 @@ const commentMapper = (model, frame) => {
             response.html = null;
         }
     }
-    
+
     return response;
 };
 

package/core/server/data/migrations/versions/5.100/2024-10-31-15-27-42-add-jobs-queue-columns.js

@@ -0,0 +1,14 @@
+const {combineNonTransactionalMigrations, createAddColumnMigration} = require('../../utils');
+
+module.exports = combineNonTransactionalMigrations(
+    createAddColumnMigration('jobs', 'metadata', {
+        type: 'string',
+        maxlength: 2000,
+        nullable: true
+    }),
+    createAddColumnMigration('jobs', 'queue_entry', {
+        type: 'integer',
+        nullable: true,
+        unsigned: true
+    })
+);

package/core/server/data/migrations/versions/5.100/2024-11-05-14-48-08-add-comments-in-reply-to-id.js

@@ -0,0 +1,10 @@
+const {createAddColumnMigration} = require('../../utils');
+
+module.exports = createAddColumnMigration('comments', 'in_reply_to_id', {
+    type: 'string',
+    maxlength: 24,
+    nullable: true,
+    unique: false,
+    references: 'comments.id',
+    setNullDelete: true
+});

package/core/server/data/migrations/versions/5.100/2024-11-06-04-45-15-add-activitypub-integration.js

@@ -0,0 +1,40 @@
+const logging = require('@tryghost/logging');
+const {createTransactionalMigration, meta} = require('../../utils');
+const ObjectID = require('bson-objectid').default;
+
+module.exports = createTransactionalMigration(
+    async function up(knex) {
+        logging.info('Adding Ghost ActivityPub integration');
+        const existing = await knex
+            .select('id')
+            .from('integrations')
+            .where('slug', '=', 'ghost-activitypub')
+            .andWhere('type', '=', 'internal')
+            .first();
+
+        if (existing) {
+            logging.warn('Found existing Ghost ActivityPub integration');
+            return;
+        }
+
+        await knex
+            .insert({
+                id: (new ObjectID).toHexString(),
+                type: 'internal',
+                slug: 'ghost-activitypub',
+                name: 'Ghost ActivityPub',
+                description: 'Internal Integration for ActivityPub',
+                created_at: knex.raw('current_timestamp'),
+                created_by: meta.MIGRATION_USER
+            })
+            .into('integrations');
+    },
+    async function down(knex) {
+        logging.info('Removing Ghost ActivityPub integration');
+        await knex
+            .del()
+            .from('integrations')
+            .where('slug', '=', 'ghost-activitypub')
+            .andWhere('type', '=', 'internal');
+    }
+);

package/core/server/data/migrations/versions/5.55/2023-07-10-05-16-55-add-built-in-collection-posts.js

@@ -14,7 +14,7 @@ const insertPostCollections = async (knex, collectionId, postIds) => {
         };
     });
 
-    await knex.batchInsert('collections_posts', collectionPosts, 1000);
+    await knex.batchInsert('collections_posts', collectionPosts, 100);
 };
 
 module.exports = createTransactionalMigration(

package/core/server/data/migrations/versions/5.65/2023-09-22-06-42-55-repopulate-built-in-featured-collection-posts.js

@@ -14,7 +14,7 @@ const insertPostCollections = async (knex, collectionId, postIds) => {
         };
     });
 
-    await knex.batchInsert('collections_posts', collectionPosts, 1000);
+    await knex.batchInsert('collections_posts', collectionPosts, 100);
 };
 
 module.exports = createTransactionalMigration(

package/core/server/data/migrations/versions/5.89/2024-07-30-19-51-06-backfill-offer-redemptions.js

@@ -50,7 +50,7 @@ module.exports = createTransactionalMigration(
                     };
                 });
                 // Batch insert rows into the offer_redemptions table
-                await knex.batchInsert('offer_redemptions', offerRedemptions, 1000);
+                await knex.batchInsert('offer_redemptions', offerRedemptions, 100);
             } else {
                 logging.info('No offer redemptions to backfill');
             }

package/core/server/data/schema/fixtures/fixtures.json

@@ -814,6 +814,13 @@
                     "description": "Internal Content API integration for Admin access",
                     "type": "core",
                     "api_keys": [{"type": "content"}]
+                },
+                {
+                    "slug": "ghost-activitypub",
+                    "name": "Ghost ActivityPub",
+                    "description": "Internal Integration for ActivityPub",
+                    "type": "internal",
+                    "api_keys": []
                 }
             ]
         }

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

@@ -958,6 +958,7 @@ module.exports = {
         post_id: {type: 'string', maxlength: 24, nullable: false, unique: false, references: 'posts.id', cascadeDelete: true},
         member_id: {type: 'string', maxlength: 24, nullable: true, unique: false, references: 'members.id', setNullDelete: true},
         parent_id: {type: 'string', maxlength: 24, nullable: true, unique: false, references: 'comments.id', cascadeDelete: true},
+        in_reply_to_id: {type: 'string', maxlength: 24, nullable: true, unique: false, references: 'comments.id', setNullDelete: true},
         status: {type: 'string', maxlength: 50, nullable: false, defaultTo: 'published', validations: {isIn: [['published', 'hidden', 'deleted']]}},
         html: {type: 'text', maxlength: 1000000000, fieldtype: 'long', nullable: true},
         edited_at: {type: 'dateTime', nullable: true},
@@ -985,7 +986,9 @@ module.exports = {
         started_at: {type: 'dateTime', nullable: true},
         finished_at: {type: 'dateTime', nullable: true},
         created_at: {type: 'dateTime', nullable: false},
-        updated_at: {type: 'dateTime', nullable: true}
+        updated_at: {type: 'dateTime', nullable: true},
+        metadata: {type: 'string', maxlength: 2000, nullable: true},
+        queue_entry: {type: 'integer', nullable: true, unsigned: true}
     },
     redirects: {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},

package/core/server/models/comment.js

@@ -46,6 +46,10 @@ const Comment = ghostBookshelf.Model.extend({
         return this.belongsTo('Comment', 'parent_id');
     },
 
+    inReplyTo() {
+        return this.belongsTo('Comment', 'in_reply_to_id');
+    },
+
     likes() {
         return this.hasMany('CommentLike', 'comment_id');
     },
@@ -94,6 +98,12 @@ const Comment = ghostBookshelf.Model.extend({
         }
     },
 
+    orderAttributes: function orderAttributes() {
+        let keys = ghostBookshelf.Model.prototype.orderAttributes.call(this, arguments);
+        keys.push('count__likes');
+        return keys;
+    },
+
     onCreated: function onCreated(model, options) {
         ghostBookshelf.Model.prototype.onCreated.apply(this, arguments);
 
@@ -175,25 +185,26 @@ const Comment = ghostBookshelf.Model.extend({
     /**
      * We have to ensure consistency. If you listen on model events (e.g. `member.added`), you can expect that you always
      * receive all fields including relations. Otherwise you can't rely on a consistent flow. And we want to avoid
-     * that event listeners have to re-fetch a resource. This function is used in the context of inserting
-     * and updating resources. We won't return the relations by default for now.
+     * that event listeners have to re-fetch a resource.
      */
     defaultRelations: function defaultRelations(methodName, options) {
-        // @todo: the default relations are not working for 'add' when we add it below
+        // @TODO: the default relations are not working for 'add' when we add it below
+        // this is because bookshelf does not automatically call `fetch` after adding so
+        // our bookshelf eager-load plugin doesn't use the `withRelated` options
         if (['findAll', 'findPage', 'edit', 'findOne', 'destroy'].indexOf(methodName) !== -1) {
             if (!options.withRelated || options.withRelated.length === 0) {
                 if (options.parentId) {
                     // Do not include replies for replies
                     options.withRelated = [
                         // Relations
-                        'member', 'count.likes', 'count.liked'
+                        'inReplyTo', 'member', 'count.likes', 'count.liked'
                     ];
                 } else {
                     options.withRelated = [
                         // Relations
-                        'member', 'count.replies', 'count.likes', 'count.liked',
+                        'member', 'inReplyTo', 'count.replies', 'count.likes', 'count.liked',
                         // Replies (limited to 3)
-                        'replies', 'replies.member' , 'replies.count.likes', 'replies.count.liked'
+                        'replies', 'replies.member', 'replies.inReplyTo', 'replies.count.likes', 'replies.count.liked'
                     ];
                 }
             }
@@ -202,47 +213,20 @@ const Comment = ghostBookshelf.Model.extend({
         return options;
     },
 
-    async findMostLikedComment(options = {}) {
-        let query = ghostBookshelf.knex('comments')
-            .select('comments.*')
-            .count('comment_likes.id as count__likes') // Counting likes for sorting
-            .leftJoin('comment_likes', 'comments.id', 'comment_likes.comment_id')
-            .groupBy('comments.id') // Group by comment ID to aggregate likes count
-            .orderBy('count__likes', 'desc') // Order by likes in descending order (most likes first)
-            .limit(1); // Limit to just 1 result
-        // Execute the query and get the result
-        const result = await query.first(); // Fetch the single top comment
-        const id = result && result.id;
-        // Fetch the comment model by ID
-        return this.findOne({id}, options);
-    },
-
     async findPage(options) {
         const {withRelated} = this.defaultRelations('findPage', options);
-
         const relationsToLoadIndividually = [
             'replies',
             'replies.member',
             'replies.count.likes',
             'replies.count.liked'
         ].filter(relation => withRelated.includes(relation));
-
         const result = await ghostBookshelf.Model.findPage.call(this, options);
 
         for (const model of result.data) {
             await model.load(relationsToLoadIndividually, _.omit(options, 'withRelated'));
         }
 
-        // if options.order === 'best', we findMostLikedComment
-        // then we remove it from the result set and add it as the first element
-        if (options.order === 'best' && options.page === '1') {
-            const mostLikedComment = await this.findMostLikedComment(options);
-            if (mostLikedComment) {
-                result.data = result.data.filter(comment => comment.id !== mostLikedComment.id);
-                result.data.unshift(mostLikedComment);
-            }
-        }
-
         return result;
     },
 

package/core/server/services/activitypub/ActivityPubServiceWrapper.js

@@ -0,0 +1,42 @@
+const {ActivityPubService} = require('@tryghost/activitypub');
+
+module.exports = class ActivityPubServiceWrapper {
+    /** @type ActivityPubService */
+    static instance;
+
+    static async init() {
+        if (ActivityPubServiceWrapper.instance) {
+            return;
+        }
+        const labs = require('../../../shared/labs');
+
+        if (!labs.isSet('ActivityPub')) {
+            return;
+        }
+
+        const urlUtils = require('../../../shared/url-utils');
+        const siteUrl = new URL(urlUtils.getSiteUrl());
+
+        const db = require('../../data/db');
+        const knex = db.knex;
+
+        const logging = require('@tryghost/logging');
+
+        const IdentityTokenServiceWrapper = require('../identity-tokens');
+
+        if (!IdentityTokenServiceWrapper.instance) {
+            logging.error(`IdentityTokenService needs to be initialised before ActivityPubService`);
+        }
+
+        ActivityPubServiceWrapper.instance = new ActivityPubService(
+            knex,
+            siteUrl,
+            logging,
+            IdentityTokenServiceWrapper.instance
+        );
+
+        if (labs.isSet('ActivityPub') && IdentityTokenServiceWrapper.instance) {
+            await ActivityPubServiceWrapper.instance.initialiseWebhooks();
+        }
+    }
+};

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

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

package/core/server/services/comments/CommentsController.js

@@ -51,7 +51,8 @@ module.exports = class CommentsController {
                 frame.options.filter = `post_id:${frame.options.post_id}`;
             }
         }
-        return this.service.getComments(frame.options);
+
+        return await this.service.getComments(frame.options);
     }
 
     /**
@@ -114,6 +115,7 @@ module.exports = class CommentsController {
         if (data.parent_id) {
             result = await this.service.replyToComment(
                 data.parent_id,
+                data.in_reply_to_id,
                 frame.options.context.member.id,
                 data.html,
                 frame.options

package/core/server/services/comments/CommentsService.js

@@ -83,7 +83,10 @@ class CommentsService {
         await this.emails.notifyPostAuthors(comment);
 
         if (comment.get('parent_id')) {
-            await this.emails.notifyParentCommentAuthor(comment);
+            await this.emails.notifyParentCommentAuthor(comment, {type: 'parent'});
+        }
+        if (comment.get('in_reply_to_id')) {
+            await this.emails.notifyParentCommentAuthor(comment, {type: 'in_reply_to'});
         }
     }
 
@@ -253,11 +256,12 @@ class CommentsService {
 
     /**
      * @param {string} parent - The ID of the Comment to reply to
+     * @param {string} inReplyTo - The ID of the Reply to reply to
      * @param {string} member - The ID of the Member to comment as
      * @param {string} comment - The HTML content of the Comment
      * @param {any} options
      */
-    async replyToComment(parent, member, comment, options) {
+    async replyToComment(parent, inReplyTo, member, comment, options) {
         this.checkEnabled();
         const memberModel = await this.models.Member.findOne({
             id: member
@@ -281,6 +285,7 @@ class CommentsService {
                 message: tpl(messages.replyToReply)
             });
         }
+
         const postModel = await this.models.Post.findOne({
             id: parentComment.get('post_id')
         }, {
@@ -291,10 +296,27 @@ class CommentsService {
 
         this.checkPostAccess(postModel, memberModel);
 
+        let inReplyToComment;
+        if (parent && inReplyTo) {
+            inReplyToComment = await this.getCommentByID(inReplyTo, options);
+
+            // we only allow references to published comments to avoid leaking
+            // hidden data via the snippet included in API responses
+            if (inReplyToComment && inReplyToComment.get('status') !== 'published') {
+                inReplyToComment = null;
+            }
+
+            // we don't allow in_reply_to references across different parents
+            if (inReplyToComment && inReplyToComment.get('parent_id') !== parent) {
+                inReplyToComment = null;
+            }
+        }
+
         const model = await this.models.Comment.add({
             post_id: parentComment.get('post_id'),
             member_id: member,
             parent_id: parentComment.id,
+            in_reply_to_id: inReplyToComment && inReplyToComment.get('id'),
             html: comment,
             status: 'published'
         }, options);

package/core/server/services/comments/CommentsServiceEmails.js

@@ -60,8 +60,13 @@ class CommentsServiceEmails {
         }
     }
 
-    async notifyParentCommentAuthor(reply) {
-        const parent = await this.models.Comment.findOne({id: reply.get('parent_id')});
+    async notifyParentCommentAuthor(reply, {type = 'parent'} = {}) {
+        let parent;
+        if (type === 'in_reply_to') {
+            parent = await this.models.Comment.findOne({id: reply.get('in_reply_to_id')});
+        } else {
+            parent = await this.models.Comment.findOne({id: reply.get('parent_id')});
+        }
         const parentMember = parent.related('member');
 
         if (parent?.get('status') !== 'published' || !parentMember.get('enable_comment_notifications')) {

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

@@ -1,4 +1,6 @@
 const logging = require('@tryghost/logging');
+const JobManager = require('../../services/jobs');
+const path = require('path');
 
 class EmailAnalyticsServiceWrapper {
     init() {
@@ -11,7 +13,7 @@ class EmailAnalyticsServiceWrapper {
         const MailgunProvider = require('@tryghost/email-analytics-provider-mailgun');
         const {EmailRecipientFailure, EmailSpamComplaintEvent, Email} = require('../../models');
         const StartEmailAnalyticsJobEvent = require('./events/StartEmailAnalyticsJobEvent');
-
+        const {MemberEmailAnalyticsUpdateEvent} = require('@tryghost/member-events');
         const domainEvents = require('@tryghost/domain-events');
         const config = require('../../../shared/config');
         const settings = require('../../../shared/settings-cache');
@@ -47,7 +49,8 @@ class EmailAnalyticsServiceWrapper {
             providers: [
                 new MailgunProvider({config, settings})
             ],
-            queries
+            queries,
+            domainEvents
         });
 
         // We currently cannot trigger a non-offloaded job from the job manager
@@ -55,6 +58,19 @@ class EmailAnalyticsServiceWrapper {
         domainEvents.subscribe(StartEmailAnalyticsJobEvent, async () => {
             await this.startFetch();
         });
+
+        domainEvents.subscribe(MemberEmailAnalyticsUpdateEvent, async (event) => {
+            const memberId = event.data.memberId;
+            await JobManager.addQueuedJob({
+                name: `update-member-email-analytics-${memberId}`,
+                metadata: {
+                    job: path.resolve(__dirname, 'jobs/update-member-email-analytics'),
+                    data: {
+                        memberId
+                    }
+                }
+            });
+        });
     }
 
     async fetchLatestOpenedEvents({maxEvents} = {maxEvents: Infinity}) {

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

@@ -0,0 +1,13 @@
+const queries = require('../../lib/queries');
+
+/**
+ * Updates email analytics for a specific member
+ * 
+ * @param {Object} options - The options object
+ * @param {string} options.memberId - The ID of the member to update analytics for
+ * @returns {Promise<Object>} The result of the aggregation query (1/0)
+ */
+module.exports = async function updateMemberEmailAnalytics({memberId}) {
+    const result = await queries.aggregateMemberStats(memberId);
+    return result;
+};

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

@@ -1,5 +1,7 @@
+const debug = require('@tryghost/debug')('i18n');
 const logging = require('@tryghost/logging');
 const url = require('../../api/endpoints/utils/serializers/output/utils/url');
+const events = require('../../lib/common/events');
 
 class EmailServiceWrapper {
     getPostUrl(post) {
@@ -49,8 +51,25 @@ class EmailServiceWrapper {
         const mailgunClient = new MailgunClient({
             config: configService, settings: settingsCache
         });
-        const i18nLanguage = settingsCache.get('locale') || 'en';
+        const i18nLanguage = labs.isSet('i18n') ? settingsCache.get('locale') || 'en' : 'en';
         const i18n = i18nLib(i18nLanguage, 'newsletter');
+        
+        events.on('settings.labs.edited', () => {
+            if (labs.isSet('i18n')) {
+                debug('labs i18n enabled, updating i18n to', settingsCache.get('locale'));
+                i18n.changeLanguage(settingsCache.get('locale'));
+            } else {
+                debug('labs i18n disabled, updating i18n to en');
+                i18n.changeLanguage('en');
+            }
+        });
+    
+        events.on('settings.locale.edited', (model) => {
+            if (labs.isSet('i18n')) {
+                debug('locale changed, updating i18n to', model.get('value'));
+                i18n.changeLanguage(model.get('value'));
+            } 
+        });
 
         const mailgunEmailProvider = new MailgunEmailProvider({
             mailgunClient,

package/core/server/services/identity-tokens/IdentityTokenServiceWrapper.js

@@ -0,0 +1,28 @@
+const {IdentityTokenService} = require('@tryghost/identity-token-service');
+
+module.exports = class IdentityTokenServiceWrapper {
+    /** @type IdentityTokenService */
+    static instance;
+
+    static async init() {
+        if (IdentityTokenServiceWrapper.instance) {
+            return;
+        }
+
+        const urlUtils = require('../../../shared/url-utils');
+        const issuer = urlUtils.urlFor('admin', true);
+
+        const settings = require('../../../shared/settings-cache');
+        const jose = require('node-jose');
+
+        const privateKey = settings.get('ghost_private_key');
+        const keyStore = jose.JWK.createKeyStore();
+        const key = await keyStore.add(privateKey, 'pem');
+
+        IdentityTokenServiceWrapper.instance = new IdentityTokenService(
+            privateKey,
+            issuer,
+            key.kid
+        );
+    }
+};

package/core/server/services/identity-tokens/index.js

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