ghost 5.33.8 → 5.34.1

package/core/built/admin/index.html

@@ -8,7 +8,7 @@
     <title>Ghost Admin</title>
 
     
-<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%225.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="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22rootURL%22%3A%22%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%225.34%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%7D" />
 
     <meta name="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-fb9fb8adbcaf1603ad4006dd2d49e401.css" title="light">
+    <link integrity="" rel="stylesheet" href="assets/ghost-558c1e319d6e025bfab2054bc0f7fe83.css" title="light">
 
     
 </head>
@@ -56,9 +56,9 @@
 
     <div id="ember-basic-dropdown-wormhole"></div>
 
-    <script src="assets/vendor-0441964c34d58f2aacd5a04bbe240243.js"></script>
-<script src="assets/chunk.963.e47ead5abeca4cf69fed.js"></script>
-<script src="assets/chunk.143.caa7dbd727b76021c31b.js"></script>
-    <script src="assets/ghost-872d240189f9b5ff85f4f7cb2ac3ab4c.js"></script>
+    <script src="assets/vendor-253d6527ca6353855164ef65f896f762.js"></script>
+<script src="assets/chunk.616.181e1ad6c33f0bec7a65.js"></script>
+<script src="assets/chunk.143.07f5af56ff872bb0e9e4.js"></script>
+    <script src="assets/ghost-ad40d109653288e74a7cd922341fb33d.js"></script>
 </body>
 </html>

package/core/cli/generate-data.js

@@ -2,10 +2,13 @@ const Command = require('./command');
 const DataGenerator = require('@tryghost/data-generator');
 const config = require('../shared/config');
 
-module.exports = class REPL extends Command {
+module.exports = class DataGeneratorCommand extends Command {
     setup() {
         this.help('Generates random data to populate the database for development & testing');
         this.argument('--base-data-pack', {type: 'string', defaultValue: '', desc: 'Base data pack file location, imported instead of random content'});
+        this.argument('--scale', {type: 'string', defaultValue: 'small', desc: 'Scale of the data to generate. `small` for a quick run, `large` for more content'});
+        this.argument('--single-table', {type: 'string', desc: 'Import a single table'});
+        this.argument('--quantity', {type: 'number', desc: 'When importing a single table, the quantity to import'});
     }
 
     initializeContext(context) {
@@ -27,6 +30,17 @@ module.exports = class REPL extends Command {
     async handle(argv = {}) {
         const knex = require('../server/data/db/connection');
         const {tables: schema} = require('../server/data/schema/index');
+
+        const modelQuantities = {};
+        if (argv.scale) {
+            if (argv.scale === 'small') {
+                modelQuantities.members = 200;
+                modelQuantities.membersLoginEvents = 1;
+                modelQuantities.posts = 10;
+            }
+            // Defaults in data-generator package make a large set
+        }
+
         const dataGenerator = new DataGenerator({
             baseDataPack: argv['base-data-pack'],
             knex,
@@ -40,11 +54,15 @@ module.exports = class REPL extends Command {
                 fatal: this.fatal,
                 debug: this.debug
             },
-            modelQuantities: {},
+            modelQuantities,
             baseUrl: config.getSiteUrl()
         });
         try {
-            await dataGenerator.importData();
+            if (argv['single-table']) {
+                await dataGenerator.importSingleTable(argv['single-table'], argv.quantity ?? undefined);
+            } else {
+                await dataGenerator.importData();
+            }
         } catch (error) {
             this.fatal('Failed while generating data: ', error);
         }

package/core/frontend/services/routing/router-manager.js

@@ -177,7 +177,7 @@ class RouterManager {
 
         // NOTE: timezone change only affects the collection router with dated permalinks
         const collectionRouter = this.registry.getRouterByName('CollectionRouter');
-        if (collectionRouter.getPermalinks().getValue().match(/:year|:month|:day/)) {
+        if (collectionRouter && collectionRouter.getPermalinks().getValue().match(/:year|:month|:day/)) {
             debug('handleTimezoneEdit: trigger regeneration');
 
             this.urlService.onRouterUpdated(collectionRouter.identifier);

package/core/frontend/web/middleware/handle-image-sizes.js

@@ -5,6 +5,7 @@ const imageTransform = require('@tryghost/image-transform');
 const storage = require('../../../server/adapters/storage');
 const activeTheme = require('../../services/theme-engine/active');
 const config = require('../../../shared/config');
+const {imageSize} = require('../../../server/lib/image');
 
 const SIZE_PATH_REGEX = /^\/size\/([^/]+)\//;
 const FORMAT_PATH_REGEX = /^\/format\/([^./]+)\//;
@@ -21,7 +22,7 @@ module.exports = function (req, res, next) {
     }
 
     const requestedDimension = req.url.match(SIZE_PATH_REGEX)[1];
-    
+
     // Note that we don't use sizeImageDir because we need to keep the trailing slash
     let imagePath = req.url.replace(`/size/${requestedDimension}`, '');
 
@@ -39,7 +40,7 @@ module.exports = function (req, res, next) {
         // We need to keep the first slash here
         let url = req.originalUrl
             .replace(`/size/${requestedDimension}`, '');
-        
+
         if (format) {
             url = url.replace(`/format/${format}`, '');
         }
@@ -81,7 +82,7 @@ module.exports = function (req, res, next) {
         return redirectToOriginal();
     }
 
-    if (format) {        
+    if (format) {
         // CASE: When formatting, we need to check if the imageTransform package supports this specific format
         if (!imageTransform.canTransformToFormat(format)) {
             // transform not supported
@@ -89,7 +90,7 @@ module.exports = function (req, res, next) {
         }
     }
 
-    // CASE: when transforming is supported, we need to check if it is desired 
+    // CASE: when transforming is supported, we need to check if it is desired
     // (e.g. it is not desired to resize SVGs when not formatting them to a different type)
     if (!format && !imageTransform.shouldResizeFileExtension(requestUrlFileExtension)) {
         return redirectToOriginal();
@@ -111,23 +112,7 @@ module.exports = function (req, res, next) {
             return;
         }
 
-        const {dir, name, ext} = path.parse(imagePath);
-        const [imageNameMatched, imageName, imageNumber] = name.match(/^(.+?)(-\d+)?$/) || [null];
-
-        if (!imageNameMatched) {
-            // CASE: Image name does not contain any characters?
-            // RESULT: Hand off to `next()` which will 404
-            return;
-        }
-        const unoptimizedImagePath = path.join(dir, `${imageName}_o${imageNumber || ''}${ext}`);
-
-        return storageInstance.exists(unoptimizedImagePath)
-            .then((unoptimizedImageExists) => {
-                if (unoptimizedImageExists) {
-                    return unoptimizedImagePath;
-                }
-                return imagePath;
-            })
+        return imageSize.getOriginalImagePath(imagePath)
             .then((storagePath) => {
                 return storageInstance.read({path: storagePath});
             })

package/core/server/adapters/cache/Redis.js

@@ -0,0 +1,3 @@
+const RedisCache = require('@tryghost/adapter-cache-redis');
+
+module.exports = RedisCache;

package/core/server/adapters/storage/LocalStorageBase.js

@@ -83,9 +83,19 @@ class LocalStorageBase extends StorageBase {
     urlToPath(url) {
         let filePath;
 
-        if (url.match(this.staticFileUrl)) {
+        const prefix = urlUtils.urlJoin('/',
+            urlUtils.getSubdir(),
+            this.staticFileURLPrefix
+        );
+
+        if (url.startsWith(this.staticFileUrl)) {
+            // CASE: full path that includes the site url
             filePath = url.replace(this.staticFileUrl, '');
             filePath = path.join(this.storagePath, filePath);
+        } else if (url.startsWith(prefix)) {
+            // CASE: The result of the save method doesn't include the site url. So we need to handle this case.
+            filePath = url.replace(prefix, '');
+            filePath = path.join(this.storagePath, filePath);
         } else {
             throw new errors.IncorrectUsageError({
                 message: tpl(messages.invalidUrlParameter, {url})

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

@@ -1,19 +1,60 @@
-const Promise = require('bluebird');
+/* eslint-disable ghost/ghost-custom/max-api-complexity */
 const storage = require('../../adapters/storage');
+const imageTransform = require('@tryghost/image-transform');
+const config = require('../../../shared/config');
+const path = require('path');
 
 module.exports = {
     docName: 'images',
     upload: {
         statusCode: 201,
         permissions: false,
-        query(frame) {
+        async query(frame) {
             const store = storage.getStorage('images');
 
-            if (frame.files) {
-                return Promise
-                    .map(frame.files, file => store.save(file))
-                    .then(paths => paths[0]);
+            // Normalize
+            const imageOptimizationOptions = config.get('imageOptimization');
+
+            // Trim _o from file name (not allowed suffix)
+            frame.file.name = frame.file.name.replace(/_o(\.\w+?)$/, '$1');
+
+            // CASE: image transform is not capable of transforming file (e.g. .gif)
+            if (imageTransform.shouldResizeFileExtension(frame.file.ext) && imageOptimizationOptions.resize) {
+                const out = `${frame.file.path}_processed`;
+                const originalPath = frame.file.path;
+
+                const options = Object.assign({
+                    in: originalPath,
+                    out,
+                    ext: frame.file.ext,
+                    width: config.get('imageOptimization:defaultMaxWidth')
+                }, imageOptimizationOptions);
+
+                await imageTransform.resizeFromPath(options);
+
+                // Store the processed/optimized image
+                const processedImageUrl = await store.save({
+                    ...frame.file,
+                    path: out
+                });
+                const processedImagePath = store.urlToPath(processedImageUrl);
+
+                // Get the path and name of the processed image
+                // We want to store the original image on the same name + _o
+                // So we need to wait for the first store to finish before generating the name of the original image
+                const processedImageName = path.basename(processedImagePath);
+                const processedImageDir = path.dirname(processedImagePath);
+
+                // Store the original image
+                await store.save({
+                    ...frame.file,
+                    path: originalPath,
+                    name: imageTransform.generateOriginalImageName(processedImageName)
+                }, processedImageDir);
+
+                return processedImageUrl;
             }
+
             return store.save(frame.file);
         }
     }

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

@@ -11,7 +11,7 @@ module.exports = {
             'page',
             'debug'
         ],
-        permissions: false,
+        permissions: true,
         query(frame) {
             return mentions.controller.browse(frame);
         }

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

@@ -2,6 +2,7 @@ const Promise = require('bluebird');
 const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 const models = require('../../models');
+const tagsPublicService = require('../../services/tags-public');
 
 const ALLOWED_INCLUDES = ['count.posts'];
 
@@ -31,7 +32,7 @@ module.exports = {
         },
         permissions: true,
         query(frame) {
-            return models.TagPublic.findPage(frame.options);
+            return tagsPublicService.api.browse(frame.options);
         }
     },
 

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

@@ -7,7 +7,7 @@ module.exports = (model) => {
         target: json.target,
         timestamp: json.timestamp,
         payload: json.payload,
-        resource_id: json.resourceId,
+        resource: json.resource,
         source_title: json.sourceTitle,
         source_site_title: json.sourceSiteTitle,
         source_excerpt: json.sourceExcerpt,

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

@@ -35,6 +35,7 @@ const author = (attrs, frame) => {
         delete attrs.free_member_signup_notification;
         delete attrs.paid_subscription_started_notification;
         delete attrs.paid_subscription_canceled_notification;
+        delete attrs.mention_notifications;
 
         // @NOTE: used for night shift
         delete attrs.accessibility;

package/core/server/data/migrations/versions/5.34/2023-01-30-07-27-add-mentions-permission.js

@@ -0,0 +1,10 @@
+const {addPermissionWithRoles} = require('../../utils');
+
+module.exports = addPermissionWithRoles({
+    name: 'Browse mentions',
+    action: 'browse',
+    object: 'mention'
+}, [
+    'Administrator',
+    'Admin Integration'
+]);

package/core/server/data/migrations/versions/5.34/2023-02-08-03-08-add-mentions-notifications-column.js

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

package/core/server/data/migrations/versions/5.34/2023-02-08-22-32-add-mentions-delete-column.js

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

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

@@ -633,6 +633,11 @@
                     "name": "Edit links",
                     "action_type": "edit",
                     "object_type": "link"
+                },
+                {
+                    "name": "Browse mentions",
+                    "action_type": "browse",
+                    "object_type": "mention"
                 }
             ]
         },
@@ -763,7 +768,8 @@
                     "newsletter": "all",
                     "explore": "read",
                     "comment": "all",
-                    "link": "all"
+                    "link": "all",
+                    "mention": "browse"
                 },
                 "DB Backup Integration": {
                     "db": "all"
@@ -798,7 +804,8 @@
                     "newsletter": ["browse", "read", "add", "edit"],
                     "explore": "read",
                     "comment": "all",
-                    "link": "all"
+                    "link": "all",
+                    "mention": "browse"
                 },
                 "Editor": {
                     "notification": "all",

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

@@ -154,6 +154,7 @@ module.exports = {
         free_member_signup_notification: {type: 'boolean', nullable: false, defaultTo: true},
         paid_subscription_started_notification: {type: 'boolean', nullable: false, defaultTo: true},
         paid_subscription_canceled_notification: {type: 'boolean', nullable: false, defaultTo: false},
+        mention_notifications: {type: 'boolean', nullable: false, defaultTo: true},
         created_at: {type: 'dateTime', nullable: false},
         created_by: {type: 'string', maxlength: 24, nullable: false},
         updated_at: {type: 'dateTime', nullable: true},
@@ -993,6 +994,7 @@ module.exports = {
         resource_id: {type: 'string', maxlength: 24, nullable: true},
         resource_type: {type: 'string', maxlength: 50, nullable: true},
         created_at: {type: 'dateTime', nullable: false},
-        payload: {type: 'text', maxlength: 65535, nullable: true}
+        payload: {type: 'text', maxlength: 65535, nullable: true},
+        deleted: {type: 'boolean', nullable: false, defaultTo: false}
     }
 };

package/core/server/lib/image/image-size.js

@@ -270,18 +270,36 @@ class ImageSize {
             });
     }
 
-    async getOriginalImageSizeFromStoragePath(imagePath) {
+    /**
+     * Returns the path of the original image for a given image path (we always store the original image in a separate file, suffixed with _o, while we store a resized version of the image on the original name)
+     * TODO: Preferrably we want to move this to a separate image utils package. Currently not really a good place to put it in image lib.
+     */
+    async getOriginalImagePath(imagePath) {
         const {dir, name, ext} = path.parse(imagePath);
+        const storageInstance = this.storage.getStorage('images');
+
+        const preferredUnoptimizedImagePath = path.join(dir, `${name}_o${ext}`);
+        const preferredUnoptimizedImagePathExists = await storageInstance.exists(preferredUnoptimizedImagePath);
+        if (preferredUnoptimizedImagePathExists) {
+            return preferredUnoptimizedImagePath;
+        }
+
+        // Legacy format did some magic with the numbers that could cause bugs. We still need to support it for old files.
+        // refs https://github.com/TryGhost/Team/issues/481
         const [imageNameMatched, imageName, imageNumber] = name.match(/^(.+?)(-\d+)?$/) || [null];
 
         if (!imageNameMatched) {
-            return this.getImageSizeFromStoragePath(imagePath);
+            return imagePath;
         }
 
-        const originalImagePath = path.join(dir, `${imageName}_o${imageNumber || ''}${ext}`);
-        const originalImageExists = await this.storage.getStorage('images').exists(originalImagePath);
+        const legacyOriginalImagePath = path.join(dir, `${imageName}_o${imageNumber || ''}${ext}`);
+        const legacyOriginalImageExists = await storageInstance.exists(legacyOriginalImagePath);
 
-        return this.getImageSizeFromStoragePath(originalImageExists ? originalImagePath : imagePath);
+        return legacyOriginalImageExists ? legacyOriginalImagePath : imagePath;
+    }
+
+    async getOriginalImageSizeFromStoragePath(imagePath) {
+        return this.getImageSizeFromStoragePath(await this.getOriginalImagePath(imagePath));
     }
 
     _getPathFromUrl(imageUrl) {

package/core/server/lib/lexical.js

@@ -1,23 +1,56 @@
+const path = require('path');
 const urlUtils = require('../../shared/url-utils');
+const config = require('../../shared/config');
+const storage = require('../adapters/storage');
 
 let nodes;
 let lexicalHtmlRenderer;
 let urlTransformMap;
 
+function populateNodes() {
+    const {DEFAULT_NODES} = require('@tryghost/kg-default-nodes');
+    nodes = DEFAULT_NODES;
+}
+
 module.exports = {
     get lexicalHtmlRenderer() {
         if (!lexicalHtmlRenderer) {
+            if (!nodes) {
+                populateNodes();
+            }
+
             const LexicalHtmlRenderer = require('@tryghost/kg-lexical-html-renderer');
-            lexicalHtmlRenderer = new LexicalHtmlRenderer();
+            lexicalHtmlRenderer = new LexicalHtmlRenderer({nodes});
         }
 
         return lexicalHtmlRenderer;
     },
 
+    render(lexical, userOptions = {}) {
+        const options = Object.assign({
+            siteUrl: config.get('url'),
+            imageOptimization: config.get('imageOptimization'),
+            canTransformImage(storagePath) {
+                const imageTransform = require('@tryghost/image-transform');
+                const {ext} = path.parse(storagePath);
+
+                // NOTE: the "saveRaw" check is smelly
+                return imageTransform.canTransformFiles()
+                    && imageTransform.shouldResizeFileExtension(ext)
+                    && typeof storage.getStorage('images').saveRaw === 'function';
+            },
+            createDocument() {
+                const {JSDOM} = require('jsdom');
+                return (new JSDOM()).window.document;
+            }
+        }, userOptions);
+
+        return this.lexicalHtmlRenderer.render(lexical, options);
+    },
+
     get nodes() {
         if (!nodes) {
-            const {DEFAULT_NODES} = require('@tryghost/kg-default-nodes');
-            nodes = DEFAULT_NODES;
+            populateNodes();
         }
 
         return nodes;

package/core/server/models/member.js

@@ -37,6 +37,9 @@ const Member = ghostBookshelf.Model.extend({
             key: 'tiers',
             replacement: 'products.slug'
         }, {
+            key: 'tier_id',
+            replacement: 'products.id'
+        },{
             key: 'newsletters',
             replacement: 'newsletters.slug'
         }, {

package/core/server/models/mention.js

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

package/core/server/models/post.js

@@ -681,7 +681,7 @@ Post = ghostBookshelf.Model.extend({
             )
         ) {
             try {
-                this.set('html', lexicalLib.lexicalHtmlRenderer.render(this.get('lexical')));
+                this.set('html', lexicalLib.render(this.get('lexical')));
             } catch (err) {
                 throw new errors.ValidationError({
                     message: tpl(messages.invalidLexicalStructure),

package/core/server/models/user.js

@@ -68,7 +68,8 @@ User = ghostBookshelf.Model.extend({
             comment_notifications: true,
             free_member_signup_notification: true,
             paid_subscription_started_notification: true,
-            paid_subscription_canceled_notification: false
+            paid_subscription_canceled_notification: false,
+            mention_notifications: true
         };
     },
 
@@ -504,6 +505,8 @@ User = ghostBookshelf.Model.extend({
             filter += '+paid_subscription_started_notification:true';
         } else if (type === 'paid-canceled') {
             filter += '+paid_subscription_canceled_notification:true';
+        } else if (type === 'mention-received') {
+            filter += '+mention_notifications:true';
         }
         const updatedOptions = _.merge({}, options, {filter, withRelated: ['roles']});
         return this.findAll(updatedOptions).then((users) => {

package/core/server/services/adapter-manager/index.js

@@ -29,5 +29,12 @@ module.exports = {
         const {adapterClassName, adapterConfig} = resolveAdapterOptions(name, adapterServiceConfig);
 
         return adapterManager.getAdapter(name, adapterClassName, adapterConfig);
+    },
+
+    /**
+     * Force recreation of all instances instead of reusing cached instances. Use when editing config file during tests.
+     */
+    clearCache() {
+        adapterManager.clearInstanceCache();
     }
 };

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

@@ -55,6 +55,24 @@ class EmailAnalyticsServiceWrapper {
         });
     }
 
+    async fetchLatest() {
+        const fetchStartDate = new Date();
+        debug('Starting email analytics fetch of latest events');
+        const eventStats = await this.service.fetchLatest();
+        const fetchEndDate = new Date();
+        debug(`Finished fetching ${eventStats.totalEvents} analytics events in ${fetchEndDate.getTime() - fetchStartDate.getTime()}ms`);
+
+        const aggregateStartDate = new Date();
+        debug(`Starting email analytics aggregation for ${eventStats.emailIds.length} emails`);
+        await this.service.aggregateStats(eventStats);
+        const aggregateEndDate = new Date();
+        debug(`Finished aggregating email analytics in ${aggregateEndDate.getTime() - aggregateStartDate.getTime()}ms`);
+
+        logging.info(`Fetched ${eventStats.totalEvents} events and aggregated stats for ${eventStats.emailIds.length} emails in ${aggregateEndDate.getTime() - fetchStartDate.getTime()}ms`);
+
+        return eventStats;
+    }
+
     async startFetch() {
         if (this.fetching) {
             logging.info('Email analytics fetch already running, skipping');
@@ -64,24 +82,15 @@ class EmailAnalyticsServiceWrapper {
 
         logging.info('Email analytics fetch started');
         try {
-            const fetchStartDate = new Date();
-            debug('Starting email analytics fetch of latest events');
-            const eventStats = await this.service.fetchLatest();
-            const fetchEndDate = new Date();
-            debug(`Finished fetching ${eventStats.totalEvents} analytics events in ${fetchEndDate.getTime() - fetchStartDate.getTime()}ms`);
-
-            const aggregateStartDate = new Date();
-            debug(`Starting email analytics aggregation for ${eventStats.emailIds.length} emails`);
-            await this.service.aggregateStats(eventStats);
-            const aggregateEndDate = new Date();
-            debug(`Finished aggregating email analytics in ${aggregateEndDate.getTime() - aggregateStartDate.getTime()}ms`);
-
-            logging.info(`Fetched ${eventStats.totalEvents} events and aggregated stats for ${eventStats.emailIds.length} emails in ${aggregateEndDate.getTime() - fetchStartDate.getTime()}ms`);
+            const eventStats = await this.fetchLatest();
 
             this.fetching = false;
             return eventStats;
         } catch (e) {
             logging.error(e, 'Error while fetching email analytics');
+
+            // Log again only the error, otherwise we lose the stack trace
+            logging.error(e);
         }
         this.fetching = false;
     }

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

@@ -58,7 +58,7 @@ class EmailServiceWrapper {
             settingsHelpers,
             renderers: {
                 mobiledoc: mobiledocLib.mobiledocHtmlRenderer,
-                lexical: lexicalLib.lexicalHtmlRenderer
+                lexical: lexicalLib
             },
             imageSize,
             urlUtils,

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

@@ -303,7 +303,7 @@ const PostEmailSerializer = {
         }
 
         if (post.lexical) {
-            post.html = lexicalLib.lexicalHtmlRenderer.render(
+            post.html = lexicalLib.render(
                 post.lexical, {target: 'email', postUrl: post.url}
             );
         } else {

package/core/server/services/members/jobs/index.js

@@ -14,10 +14,12 @@ module.exports = {
         ) {
             // use a random seconds value to avoid spikes to external APIs on the minute
             const s = Math.floor(Math.random() * 60); // 0-59
+            const m = Math.floor(Math.random() * 60); // 0-59
+            const h = Math.floor(Math.random() * 6); // 0-5
 
-            // Run everyday at 12:05:X AM to clean all expired complimentary subscriptions
+            // Run everyday at {0-5}:XX:XX AM to clean all expired complimentary subscriptions
             jobsService.addJob({
-                at: `${s} 5 0 * * *`,
+                at: `${s} ${m} ${h} * * *`,
                 job: path.resolve(__dirname, 'clean-expired-comped.js'),
                 name: 'clean-expired-comped'
             });