ghost 5.94.0 → 5.94.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%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.94%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%226239fc6ccd%22%2C%22adminXDemoFilename%22%3A%22admin-x-demo.js%22%2C%22adminXDemoHash%22%3A%220f930972a7%22%2C%22adminXSettingsFilename%22%3A%22admin-x-settings.js%22%2C%22adminXSettingsHash%22%3A%221264c822b3%22%2C%22adminXActivitypubFilename%22%3A%22admin-x-activitypub.js%22%2C%22adminXActivitypubHash%22%3A%229aa7d7e927%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.94%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%226239fc6ccd%22%2C%22adminXDemoFilename%22%3A%22admin-x-demo.js%22%2C%22adminXDemoHash%22%3A%228b99c7b505%22%2C%22adminXSettingsFilename%22%3A%22admin-x-settings.js%22%2C%22adminXSettingsHash%22%3A%22a6659cb218%22%2C%22adminXActivitypubFilename%22%3A%22admin-x-activitypub.js%22%2C%22adminXActivitypubHash%22%3A%2205afab033a%22%7D" />
 
     <meta name="HandheldFriendly" content="True" />
     <meta name="MobileOptimized" content="320" />
@@ -37,7 +37,7 @@
     </style>
 
     <link integrity="" rel="stylesheet" href="assets/vendor-0ede59da8efb5e28fa929557f7ff7154.css">
-    <link integrity="" rel="stylesheet" href="assets/ghost-d1c51d3a2d840dda5aa7b4ffe6057756.css" title="light">
+    <link integrity="" rel="stylesheet" href="assets/ghost-81adcc22c7836b40b08a662812319e01.css" title="light">
 
     
 </head>
@@ -57,8 +57,8 @@
     <div id="ember-basic-dropdown-wormhole"></div>
 
     <script src="assets/vendor-649dc64bfd9ecc1bd7361b53680dfdc2.js"></script>
-<script src="assets/chunk.785.78610bd253a9e2419ec9.js"></script>
-<script src="assets/chunk.524.b9da8e9c62fc112baf2b.js"></script>
-    <script src="assets/ghost-535088daf62c8cbea78a012bb6bbafc6.js"></script>
+<script src="assets/chunk.785.1cf095d594cd27c9036e.js"></script>
+<script src="assets/chunk.524.846f0087859e8da09f30.js"></script>
+    <script src="assets/ghost-492e8f36dfc460b4f2228259c27a1711.js"></script>
 </body>
 </html>

package/core/server/data/importer/import-manager.js

@@ -3,7 +3,7 @@ const fs = require('fs-extra');
 const path = require('path');
 const os = require('os');
 const glob = require('glob');
-const uuid = require('uuid');
+const crypto = require('crypto');
 const config = require('../../../shared/config');
 const {extract} = require('@tryghost/zip');
 const tpl = require('@tryghost/tpl');
@@ -220,7 +220,7 @@ class ImportManager {
      * @returns {Promise<string>} full path to the extracted folder
      */
     async extractZip(filePath) {
-        const tmpDir = path.join(os.tmpdir(), uuid.v4());
+        const tmpDir = path.join(os.tmpdir(), crypto.randomUUID());
         this.fileToDelete = tmpDir;
 
         try {

package/core/server/data/importer/importers/data/PostsImporter.js

@@ -1,6 +1,6 @@
 const debug = require('@tryghost/debug')('importer:posts');
 const _ = require('lodash');
-const uuid = require('uuid');
+const crypto = require('crypto');
 const BaseImporter = require('./Base');
 const mobiledocLib = require('../../../../lib/mobiledoc');
 const validator = require('@tryghost/validator');
@@ -29,7 +29,7 @@ class PostsImporter extends BaseImporter {
     sanitizeAttributes() {
         _.each(this.dataToImport, (obj) => {
             if (!validator.isUUID(obj.uuid || '')) {
-                obj.uuid = uuid.v4();
+                obj.uuid = crypto.randomUUID();
             }
 
             // we used to have post.page=true/false

package/core/server/data/migrations/versions/4.46/2022-04-13-12-58-fill-uuid-for-newsletters.js

@@ -1,5 +1,5 @@
 const logging = require('@tryghost/logging');
-const uuid = require('uuid');
+const crypto = require('crypto');
 const {createTransactionalMigration} = require('../../utils');
 
 module.exports = createTransactionalMigration(
@@ -10,7 +10,7 @@ module.exports = createTransactionalMigration(
 
         // eslint-disable-next-line no-restricted-syntax
         for (const newsletter of newslettersWithoutUUID) {
-            await knex('newsletters').update('uuid', uuid.v4()).where('id', newsletter.id);
+            await knex('newsletters').update('uuid', crypto.randomUUID()).where('id', newsletter.id);
         }
     },
     async function down() {

package/core/server/data/migrations/versions/4.46/2022-04-13-13-00-add-default-newsletter.js

@@ -1,5 +1,5 @@
 const ObjectId = require('bson-objectid').default;
-const uuid = require('uuid');
+const crypto = require('crypto');
 const logging = require('@tryghost/logging');
 const startsWith = require('lodash/startsWith');
 const {createTransactionalMigration} = require('../../utils');
@@ -9,7 +9,7 @@ module.exports = createTransactionalMigration(
         // This uses the default settings from core/server/data/schema/default-settings/default-settings.json
         const newsletter = {
             id: (new ObjectId()).toHexString(),
-            uuid: uuid.v4(),
+            uuid: crypto.randomUUID(),
             name: 'Ghost',
             description: '',
             slug: 'default-newsletter',

package/core/server/models/email.js

@@ -1,4 +1,4 @@
-const uuid = require('uuid');
+const crypto = require('crypto');
 const ghostBookshelf = require('./base');
 
 const Email = ghostBookshelf.Model.extend({
@@ -6,7 +6,7 @@ const Email = ghostBookshelf.Model.extend({
 
     defaults: function defaults() {
         return {
-            uuid: uuid.v4(),
+            uuid: crypto.randomUUID(),
             status: 'pending',
             recipient_filter: 'status:-free',
             track_opens: false,

package/core/server/models/member.js

@@ -1,5 +1,5 @@
 const ghostBookshelf = require('./base');
-const uuid = require('uuid');
+const crypto = require('crypto');
 const _ = require('lodash');
 const config = require('../../shared/config');
 const {gravatar} = require('../lib/image');
@@ -10,8 +10,8 @@ const Member = ghostBookshelf.Model.extend({
     defaults() {
         return {
             status: 'free',
-            uuid: uuid.v4(),
-            transient_id: uuid.v4(),
+            uuid: crypto.randomUUID(),
+            transient_id: crypto.randomUUID(),
             email_count: 0,
             email_opened_count: 0,
             enable_comment_notifications: true

package/core/server/models/newsletter.js

@@ -1,6 +1,6 @@
 const ghostBookshelf = require('./base');
 const ObjectID = require('bson-objectid').default;
-const uuid = require('uuid');
+const crypto = require('crypto');
 const urlUtils = require('../../shared/url-utils');
 
 const Newsletter = ghostBookshelf.Model.extend({
@@ -8,7 +8,7 @@ const Newsletter = ghostBookshelf.Model.extend({
 
     defaults: function defaults() {
         return {
-            uuid: uuid.v4(),
+            uuid: crypto.randomUUID(),
             sender_reply_to: 'newsletter',
             status: 'active',
             visibility: 'members',

package/core/server/models/post.js

@@ -1,6 +1,6 @@
 // # Post Model
 const _ = require('lodash');
-const uuid = require('uuid');
+const crypto = require('crypto');
 const moment = require('moment');
 const {sequence} = require('@tryghost/promise');
 const tpl = require('@tryghost/tpl');
@@ -89,7 +89,7 @@ Post = ghostBookshelf.Model.extend({
         }
 
         return {
-            uuid: uuid.v4(),
+            uuid: crypto.randomUUID(),
             status: 'draft',
             featured: false,
             type: 'post',

package/core/server/models/settings.js

@@ -1,5 +1,4 @@
 const _ = require('lodash');
-const uuid = require('uuid');
 const crypto = require('crypto');
 const keypair = require('keypair');
 const ObjectID = require('bson-objectid').default;
@@ -50,7 +49,7 @@ function parseDefaultSettings() {
     const defaultSettingsFlattened = {};
 
     const dynamicDefault = {
-        db_hash: () => uuid.v4(),
+        db_hash: () => crypto.randomUUID(),
         public_hash: () => crypto.randomBytes(15).toString('hex'),
         admin_session_secret: () => crypto.randomBytes(32).toString('hex'),
         theme_session_secret: () => crypto.randomBytes(32).toString('hex'),

package/core/server/services/members-events/index.js

@@ -12,7 +12,7 @@ class MembersEventsServiceWrapper {
         }
 
         // Wire up all the dependencies
-        const {EventStorage, LastSeenAtUpdater} = require('@tryghost/members-events-service');
+        const {EventStorage, LastSeenAtUpdater, LastSeenAtCache} = require('@tryghost/members-events-service');
         const models = require('../../models');
 
         // Listen for events and store them in the database
@@ -26,6 +26,14 @@ class MembersEventsServiceWrapper {
 
         const db = require('../../data/db');
 
+        // Create the last seen at cache and inject it into the last seen at updater
+        this.lastSeenAtCache = new LastSeenAtCache({
+            services: {
+                settingsCache
+            }
+        });
+
+        // Create the last seen at updater
         this.lastSeenAtUpdater = new LastSeenAtUpdater({
             services: {
                 settingsCache
@@ -34,12 +42,22 @@ class MembersEventsServiceWrapper {
                 return members.api;
             },
             db,
-            events
+            events,
+            lastSeenAtCache: this.lastSeenAtCache
         });
 
+        // Subscribe to domain events
         this.eventStorage.subscribe(DomainEvents);
         this.lastSeenAtUpdater.subscribe(DomainEvents);
     }
+
+    // Clear the last seen at cache
+    // Utility used for testing purposes
+    clearLastSeenAtCache() {
+        if (this.lastSeenAtCache) {
+            this.lastSeenAtCache.clear();
+        }
+    }
 }
 
 module.exports = new MembersEventsServiceWrapper();

package/core/server/web/parent/middleware/request-id.js

@@ -1,4 +1,4 @@
-const uuid = require('uuid');
+const crypto = require('crypto');
 
 /**
  * @TODO: move this middleware to Framework monorepo?
@@ -8,7 +8,7 @@ const uuid = require('uuid');
  * @param {import('express').NextFunction} next
  */
 module.exports = function requestIdMw(req, res, next) {
-    const requestId = req.get('X-Request-ID') || uuid.v4();
+    const requestId = req.get('X-Request-ID') || crypto.randomUUID();
 
     // Set a value for internal use
     req.requestId = requestId;

package/core/shared/labs.js

@@ -44,7 +44,8 @@ const ALPHA_FEATURES = [
     'importMemberTier',
     'lexicalIndicators',
     'adminXDemo',
-    'contentVisibility'
+    'contentVisibility',
+    'commentImprovements'
 ];
 
 module.exports.GA_KEYS = [...GA_FEATURES];

package/core/shared/settings-cache/public.js

@@ -46,5 +46,6 @@ module.exports = {
     outbound_link_tagging: 'outbound_link_tagging',
     default_email_address: 'default_email_address',
     support_email_address: 'support_email_address',
-    editor_default_email_recipients: 'editor_default_email_recipients'
+    editor_default_email_recipients: 'editor_default_email_recipients',
+    labs: 'labs'
 };