ghost 5.94.0 → 5.94.2

package/core/built/admin/assets/{vendor-649dc64bfd9ecc1bd7361b53680dfdc2.js → vendor-b83f61eee071be0ef00075df9ff7782d.js}

@@ -5025,22 +5025,22 @@ i===o-1&&(c&&c.call(s,s),a&&a.resolver(s))},m(e,p,l)}})),d.each(["In","Out"],(fu
 0!==i&&(l.begin=null),l.complete=i!==o-1?null:function(){u&&u.call(s,s),a&&a.resolver(s)},l.display===n&&(l.display="In"===t?"auto":"none"),m(this,c,l)}})),m}function w(e){var t=d.data(e,"velocity")
 return null===t?n:t}function E(e,t){var r=w(e)
 r&&r.delayTimer&&!r.delayPaused&&(r.delayRemaining=r.delay-t+r.delayBegin,r.delayPaused=!0,clearTimeout(r.delayTimer.setTimeout))}function x(e,t){var r=w(e)
-r&&r.delayTimer&&r.delayPaused&&(r.delayPaused=!1,r.delayTimer.setTimeout=setTimeout(r.delayTimer.next,r.delayRemaining))}function k(e){return function(t){return Math.round(t*e)*(1/e)}}function M(e,r,n,i){var o=4,s=1e-7,a=10,l=11,u=1/(l-1),c="Float32Array"in t
+r&&r.delayTimer&&r.delayPaused&&(r.delayPaused=!1,r.delayTimer.setTimeout=setTimeout(r.delayTimer.next,r.delayRemaining))}function k(e){return function(t){return Math.round(t*e)*(1/e)}}function M(e,r,n,i){var o=.1,s="Float32Array"in t
 if(4!==arguments.length)return!1
-for(var d=0;d<4;++d)if("number"!=typeof arguments[d]||isNaN(arguments[d])||!isFinite(arguments[d]))return!1
+for(var a=0;a<4;++a)if("number"!=typeof arguments[a]||isNaN(arguments[a])||!isFinite(arguments[a]))return!1
 e=Math.min(e,1),n=Math.min(n,1),e=Math.max(e,0),n=Math.max(n,0)
-var h=c?new Float32Array(l):new Array(l)
-function p(e,t){return 1-3*t+3*e}function f(e,t){return 3*t-6*e}function m(e){return 3*e}function g(e,t,r){return((p(t,r)*e+f(t,r))*e+m(t))*e}function b(e,t,r){return 3*p(t,r)*e*e+2*f(t,r)*e+m(t)}function v(t){for(var r=0,i=1,c=l-1;i!==c&&h[i]<=t;++i)r+=u;--i
-var d=r+(t-h[i])/(h[i+1]-h[i])*u,p=b(d,e,n)
-return p>=.001?function(t,r){for(var i=0;i<o;++i){var s=b(r,e,n)
-if(0===s)return r
-r-=(g(r,e,n)-t)/s}return r}(t,d):0===p?d:function(t,r,i){var o,l,u=0
-do{(o=g(l=r+(i-r)/2,e,n)-t)>0?i=l:r=l}while(Math.abs(o)>s&&++u<a)
-return l}(t,r,r+u)}var y=!1
-function _(){y=!0,e===r&&n===i||function(){for(var t=0;t<l;++t)h[t]=g(t*u,e,n)}()}var w=function(t){return y||_(),e===r&&n===i?t:0===t?0:1===t?1:g(v(t),r,i)}
-w.getControlPoints=function(){return[{x:e,y:r},{x:n,y:i}]}
-var E="generateBezier("+[e,r,n,i]+")"
-return w.toString=function(){return E},w}function O(e,t){var r=e
+var l=s?new Float32Array(11):new Array(11)
+function u(e,t){return 1-3*t+3*e}function c(e,t){return 3*t-6*e}function d(e){return 3*e}function h(e,t,r){return((u(t,r)*e+c(t,r))*e+d(t))*e}function p(e,t,r){return 3*u(t,r)*e*e+2*c(t,r)*e+d(t)}function f(t){for(var r=0,i=1;10!==i&&l[i]<=t;++i)r+=o;--i
+var s=r+(t-l[i])/(l[i+1]-l[i])*o,a=p(s,e,n)
+return a>=.001?function(t,r){for(var i=0;i<4;++i){var o=p(r,e,n)
+if(0===o)return r
+r-=(h(r,e,n)-t)/o}return r}(t,s):0===a?s:function(t,r,i){var o,s,a=0
+do{(o=h(s=r+(i-r)/2,e,n)-t)>0?i=s:r=s}while(Math.abs(o)>1e-7&&++a<10)
+return s}(t,r,r+o)}var m=!1
+function g(){m=!0,e===r&&n===i||function(){for(var t=0;t<11;++t)l[t]=h(t*o,e,n)}()}var b=function(t){return m||g(),e===r&&n===i?t:0===t?0:1===t?1:h(f(t),r,i)}
+b.getControlPoints=function(){return[{x:e,y:r},{x:n,y:i}]}
+var v="generateBezier("+[e,r,n,i]+")"
+return b.toString=function(){return v},b}function O(e,t){var r=e
 return h.isString(e)?m.Easings[e]||(r=!1):r=h.isArray(e)&&1===e.length?k.apply(null,e):h.isArray(e)&&2===e.length?g.apply(null,e.concat([t])):!(!h.isArray(e)||4!==e.length)&&M.apply(null,e),!1===r&&(r=m.Easings[m.defaults.easing]?m.defaults.easing:f),r}function P(e){if(e){var t=m.timestamp&&!0!==e?e:a.now(),r=m.State.calls.length
 r>1e4&&(m.State.calls=function(e){for(var t=-1,r=e?e.length:0,n=[];++t<r;){var i=e[t]
 i&&n.push(i)}return n}(m.State.calls),r=m.State.calls.length)
@@ -9520,4 +9520,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-66e18706cdbe72bd773ca649459072a6.map
+//# sourceMappingURL=vendor-939d4c13e18563bdb323ea7d667d4247.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.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%22ee37f0b9eb%22%2C%22adminXDemoFilename%22%3A%22admin-x-demo.js%22%2C%22adminXDemoHash%22%3A%22c03d9a88f8%22%2C%22adminXSettingsFilename%22%3A%22admin-x-settings.js%22%2C%22adminXSettingsHash%22%3A%22da80d9972a%22%2C%22adminXActivitypubFilename%22%3A%22admin-x-activitypub.js%22%2C%22adminXActivitypubHash%22%3A%2219aa6f46ae%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>
@@ -56,9 +56,9 @@
 
     <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/vendor-b83f61eee071be0ef00075df9ff7782d.js"></script>
+<script src="assets/chunk.602.a3d38ba0a516decd78ce.js"></script>
+<script src="assets/chunk.524.cd82d3016052a43d2b44.js"></script>
+    <script src="assets/ghost-27a2284f57455ac2e06f1553344f5ba7.js"></script>
 </body>
 </html>

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

@@ -9,6 +9,7 @@ module.exports = {
     emailFailures: require('./email-failures'),
     images: require('./images'),
     integrations: require('./integrations'),
+    oembed: require('./oembed'),
     pages: require('./pages'),
     posts: require('./posts'),
     settings: require('./settings'),

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

@@ -0,0 +1,5 @@
+const url = require('../utils/url');
+
+module.exports = (path) => {
+    return url.forImage(path);
+};

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

@@ -1,8 +1,15 @@
 const debug = require('@tryghost/debug')('api:endpoints:utils:serializers:output:oembed');
+const mappers = require('./mappers');
 
 module.exports = {
     all(data, apiConfig, frame) {
         debug('all');
+        if (data?.metadata?.thumbnail) {
+            data.metadata.thumbnail = mappers.oembed(data.metadata.thumbnail);
+        }
+        if (data?.metadata?.icon) {
+            data.metadata.icon = mappers.oembed(data.metadata.icon);
+        }
         frame.response = data;
     }
 };

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/email-analytics/lib/queries.js

@@ -117,8 +117,8 @@ module.exports = {
                 await db.knex('jobs').insert({
                     id: new ObjectID().toHexString(),
                     name: jobName,
-                    [updateField]: date,
-                    updated_at: date,
+                    [updateField]: date.toISOString(), // force to iso string for sqlite
+                    updated_at: date.toISOString(), // force to iso string for sqlite
                     status: status
                 });
             }

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'
 };