ghost 5.86.1 → 5.87.0

package/core/built/admin/assets/{vendor-232fd88c6ffbd896b34c449112793e93.js → vendor-104fd33edb243021ce2f1a3797d513ef.js}

@@ -9172,11 +9172,11 @@ e.default={content:'<defs><style>.info_svg__a{fill:none;stroke:currentColor;stro
 Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
 e.default={content:'<g stroke="#343f44" fill="none" fill-rule="evenodd"><path d="M-1-3h48v48H-1z" stroke="none"/><g stroke-linecap="round" stroke-linejoin="round"><path d="M32.932 6.574c.713.428 1.069 1.057 1.068 1.888v9.278l-11 7.076-11-7.076V8.462c0-.831.355-1.46 1.068-1.888l8.8-5.28c.755-.453 1.51-.453 2.264 0l8.8 5.28zM23 13.816v11"/><path d="M34 31.416l-11-6.6 11-7.076 10 6.426c.669.435 1.002 1.052 1 1.85v8.124c.002.798-.331 1.415-1 1.85l-8.8 5.66c-.793.51-1.587.51-2.38 0L23 35.34V24.816m11 6.6V42M23 24.816V35.34l-9.8 6.31c-.793.51-1.587.51-2.38 0l-8.8-5.66c-.678-.43-1.018-1.047-1.02-1.85v-8.124c-.002-.798.331-1.415 1-1.85l10-6.426 11 7.076-11 6.6m0 0L1.262 24.974M12 31.416V42m11-28.184L12.282 7.384m21.436 0L23 13.816m21.738 11.158L34 31.416"/></g></g>',attrs:{viewBox:"0 0 46 43"}}})),define("ember-svg-jar/inlined/keyboard",["exports"],(function(e){"use strict"
 Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default={content:'<path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M21 5H3a2 2 0 00-2 2v11a2 2 0 002 2h18a2 2 0 002-2V7a2 2 0 00-2-2zM5 10h2m4 0h2m4 0h2M5 15h2m4 0h8"/>',attrs:{fill:"none",viewBox:"0 0 24 24"}}})),define("ember-svg-jar/inlined/koenig/kg-edit",["exports"],(function(e){"use strict"
+e.default={content:'<path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.5" d="M21 5H3a2 2 0 00-2 2v11a2 2 0 002 2h18a2 2 0 002-2V7a2 2 0 00-2-2zM5 10h2m4 0h2m4 0h2M5 15h2m4 0h8"/>',attrs:{fill:"none",viewBox:"0 0 24 24"}}})),define("ember-svg-jar/inlined/koenig/kg-trash",["exports"],(function(e){"use strict"
 Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default={content:'<g fill="currentColor"><path d="M13.086 5.5l-9.793 9.793a1.01 1.01 0 00-.241.391l-2 6a1 1 0 001.264 1.265l6-2c.147-.049.281-.132.391-.242l9.793-9.793L13.086 5.5zM22.414 4.172l-2.586-2.586a2.001 2.001 0 00-2.828 0l-2.5 2.5L19.914 9.5l2.5-2.5c.378-.378.586-.88.586-1.414s-.208-1.037-.586-1.414z"/></g>',attrs:{viewBox:"0 0 24 24"}}})),define("ember-svg-jar/inlined/koenig/kg-trash",["exports"],(function(e){"use strict"
+e.default={content:'<path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M1.917 5.583h20.166m-8.02-3.666H9.936a1.375 1.375 0 00-1.374 1.375v2.291h6.874V3.292a1.375 1.375 0 00-1.374-1.375zM9.938 17.27v-6.874m4.125 6.874v-6.874"/><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M18.288 20.818a1.366 1.366 0 01-1.366 1.265H7.077a1.366 1.366 0 01-1.365-1.265L4.438 5.583h15.125l-1.275 15.235z"/>',attrs:{fill:"none",viewBox:"0 0 24 24"}}})),define("ember-svg-jar/inlined/koenig/kg-wand",["exports"],(function(e){"use strict"
 Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default={content:'<g fill="#FFF" fill-rule="nonzero"><path d="M1.3 4.6a.6.6 0 010-1.2h13.5a.6.6 0 010 1.2H1.3z"/><path d="M13.9 4v9.5c0 1.331-.769 2.1-2.1 2.1H4.3c-1.331 0-2.1-.769-2.1-2.1V4a.6.6 0 01.6-.6h10.5a.6.6 0 01.6.6zM5.95 6.75v5.5a.6.6 0 001.2 0v-5.5a.6.6 0 00-1.2 0zm3 0v5.5a.6.6 0 001.2 0v-5.5a.6.6 0 00-1.2 0z"/><path d="M5.65 4a.6.6 0 01-1.2 0V2.5c0-.573.21-1.08.615-1.485S5.977.4 6.55.4h3c1.331 0 2.1.769 2.1 2.1V4a.6.6 0 01-1.2 0V2.5c0-.669-.231-.9-.9-.9h-3a.843.843 0 00-.636.264.846.846 0 00-.264.636V4z"/></g>',attrs:{viewBox:"0 0 16 16"}}})),define("ember-svg-jar/inlined/labs",["exports"],(function(e){"use strict"
+e.default={content:'<path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" d="M1 21.094L3.913 24 17 10.906 14.125 8 1 21.094zM11 11l3 3M5.25 4.25a2.5 2.5 0 002.5-2.5 2.5 2.5 0 002.5 2.5 2.5 2.5 0 00-2.5 2.5 2.5 2.5 0 00-2.5-2.5zm12 0a2.5 2.5 0 002.5-2.5 2.5 2.5 0 002.5 2.5 2.5 2.5 0 00-2.5 2.5 2.5 2.5 0 00-2.5-2.5zm0 11.99a2.5 2.5 0 002.5-2.5 2.5 2.5 0 002.5 2.5 2.5 2.5 0 00-2.5 2.5 2.5 2.5 0 00-2.5-2.5z"/>',attrs:{fill:"none",viewBox:"0 0 24 25"}}})),define("ember-svg-jar/inlined/labs",["exports"],(function(e){"use strict"
 Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
 e.default={content:'<defs><style>.labs_svg__a{fill:none;stroke:currentColor;stroke-linecap:round;stroke-linejoin:round;stroke-width:1.5px}</style></defs><path class="labs_svg__a" d="M6.726.75h10.5m-1.5 7.5V.75h-7.5v7.5L1.489 18.615A3 3 0 004 23.25h15.948a3 3 0 002.515-4.635zm-10.425 4.5h13.35m-4.425 4.5h3m-1.5-1.5v3"/><path class="labs_svg__a" d="M6.726 19.125a.375.375 0 01.374.375m-.749 0a.375.375 0 01.375-.375m0 .75a.375.375 0 01-.375-.375"/><path class="labs_svg__a" d="M7.1 19.5a.375.375 0 01-.375.375m3.001-3.75a.375.375 0 01.375.375m-.75 0a.375.375 0 01.375-.375m0 .75a.375.375 0 01-.375-.375"/><path class="labs_svg__a" d="M10.1 16.5a.375.375 0 01-.375.375M15.726 3.75h-3m3 3h-3"/>',attrs:{viewBox:"0 0 24 24"}}})),define("ember-svg-jar/inlined/link",["exports"],(function(e){"use strict"
 Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
@@ -9937,4 +9937,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-aebbe7e22fe23d62e5a5d07594747524.map
+//# sourceMappingURL=vendor-d98d3e3e85163f4632ac6537fe4406cb.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.86%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%2262f98e1b33%22%2C%22adminXDemoFilename%22%3A%22admin-x-demo.js%22%2C%22adminXDemoHash%22%3A%224245030234%22%2C%22adminXSettingsFilename%22%3A%22admin-x-settings.js%22%2C%22adminXSettingsHash%22%3A%226b8583f4e9%22%2C%22adminXActivitypubFilename%22%3A%22admin-x-activitypub.js%22%2C%22adminXActivitypubHash%22%3A%22f6cd11e49b%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.87%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%228266664e32%22%2C%22adminXDemoFilename%22%3A%22admin-x-demo.js%22%2C%22adminXDemoHash%22%3A%224245030234%22%2C%22adminXSettingsFilename%22%3A%22admin-x-settings.js%22%2C%22adminXSettingsHash%22%3A%2265275a5bdb%22%2C%22adminXActivitypubFilename%22%3A%22admin-x-activitypub.js%22%2C%22adminXActivitypubHash%22%3A%22c9a754a9f6%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-117facae643a21dde076079b84fce471.css" title="light">
+    <link integrity="" rel="stylesheet" href="assets/ghost-ce50e3eb300a8e297d8b1f8b372c25d6.css" title="light">
 
     
 </head>
@@ -56,9 +56,9 @@
 
     <div id="ember-basic-dropdown-wormhole"></div>
 
-    <script src="assets/vendor-232fd88c6ffbd896b34c449112793e93.js"></script>
+    <script src="assets/vendor-104fd33edb243021ce2f1a3797d513ef.js"></script>
 <script src="assets/chunk.216.1641331b33471771559d.js"></script>
-<script src="assets/chunk.524.1f4d5090856e8f276abe.js"></script>
-    <script src="assets/ghost-cc7512accd98e0fa3cc0906c52204a55.js"></script>
+<script src="assets/chunk.524.d2e0fcb8c19f3c1a3b30.js"></script>
+    <script src="assets/ghost-7cd5e5705abfd8aa74248fc44aec54b5.js"></script>
 </body>
 </html>

package/core/frontend/helpers/get.js

@@ -299,7 +299,7 @@ module.exports = async function get(resource, options) {
     try {
         const spanName = `{{#get "${resource}"${apiOptionsString}}} ${data.member ? 'member' : 'public'}`;
         const result = await Sentry.startSpan({
-            op: 'frontend.helpers.get', 
+            op: 'frontend.helpers.get',
             name: spanName,
             tags: {
                 resource,
@@ -313,11 +313,11 @@ module.exports = async function get(resource, options) {
             if (response[resource] && response[resource].length) {
                 response[resource].forEach(prepareContextResource);
             }
-    
+
             // used for logging details of slow requests
             returnedRowsCount = response[resource] && response[resource].length;
             span?.setTag('returnedRows', returnedRowsCount);
-    
+
             // block params allows the theme developer to name the data using something like
             // `{{#get "posts" as |result pageInfo|}}`
             const blockParams = [response[resource]];
@@ -325,7 +325,7 @@ module.exports = async function get(resource, options) {
                 response.pagination = response.meta.pagination;
                 blockParams.push(response.meta.pagination);
             }
-    
+
             // Call the main template function
             const rendered = options.fn(response, {
                 data: data,
@@ -357,7 +357,9 @@ module.exports = async function get(resource, options) {
                         apiOptions,
                         returnedRows: returnedRowsCount
                     }
-                }));
+                }), {
+                    time: totalMs
+                });
             }
         }
     }

package/core/frontend/src/cards/css/bookmark.css

@@ -12,6 +12,7 @@
 .kg-bookmark-card a.kg-bookmark-container,
 .kg-bookmark-card a.kg-bookmark-container:hover {
     display: flex;
+    background: #fff;
     text-decoration: none;
     border-radius: 6px;
     border: 1px solid rgb(124 139 154 / 25%);
@@ -28,6 +29,7 @@
     justify-content: flex-start;
     padding: 20px;
     overflow: hidden;
+    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
 }
 
 .kg-bookmark-title {

package/core/server/api/endpoints/utils/serializers/input/pages.js

@@ -7,6 +7,7 @@ const slugFilterOrder = require('./utils/slug-filter-order');
 const localUtils = require('../../index');
 const mobiledoc = require('../../../../../lib/mobiledoc');
 const postsMetaSchema = require('../../../../../data/schema').tables.posts_meta;
+const postsSchema = require('../../../../../data/schema').tables.posts;
 const clean = require('./utils/clean');
 const lexical = require('../../../../../lib/lexical');
 const sentry = require('../../../../../../shared/sentry');
@@ -24,6 +25,33 @@ function removeSourceFormats(frame) {
     }
 }
 
+/**
+ * Selects all allowed columns for the given frame.
+ * 
+ * This removes the lexical and mobiledoc columns from the query. This is a performance improvement as we never intend
+ *  to expose those columns in the content API and they are very large datasets to be passing around and de/serializing.
+ * 
+ * NOTE: This is only intended for the Content API. We need these fields within Admin API responses.
+ *
+ * @param {Object} frame - The frame object.
+ */
+function selectAllAllowedColumns(frame) {
+    if (!frame.options.columns && !frame.options.selectRaw) {
+        // Because we're returning columns directly from the schema we need to remove info columns like @@UNIQUE_CONSTRAINTS@@ and @@INDEXES@@
+        frame.options.selectRaw = _.keys(_.omit(postsSchema, ['lexical','mobiledoc','@@INDEXES@@','@@UNIQUE_CONSTRAINTS@@'])).join(',');
+    } else if (frame.options.columns) {
+        frame.options.columns = frame.options.columns.filter((column) => {
+            return !['mobiledoc', 'lexical'].includes(column);
+        });
+    } else if (frame.options.selectRaw) {
+        frame.options.selectRaw = frame.options.selectRaw.split(',').map((column) => {
+            return column.trim();
+        }).filter((column) => {
+            return !['mobiledoc', 'lexical'].includes(column);
+        }).join(',');
+    }
+}
+
 function defaultRelations(frame) {
     if (frame.options.withRelated) {
         return;
@@ -97,7 +125,10 @@ module.exports = {
         forcePageFilter(frame);
 
         if (localUtils.isContentAPI(frame)) {
-            removeSourceFormats(frame);
+            // CASE: the content api endpoint for posts should not return mobiledoc or lexical
+            removeSourceFormats(frame); // remove from the format field
+            selectAllAllowedColumns(frame); // remove from any specified column or selectRaw options            
+
             setDefaultOrder(frame);
             forceVisibilityColumn(frame);
         }

package/core/server/api/endpoints/utils/serializers/input/posts.js

@@ -47,8 +47,8 @@ function removeSourceFormats(frame) {
  */
 function selectAllAllowedColumns(frame) {
     if (!frame.options.columns && !frame.options.selectRaw) {
-        // Because we're returning columns directly from the table we need to remove info columns like @@UNIQUE_CONSTRAINTS@@
-        frame.options.selectRaw = _.keys(_.omit(postsSchema, ['lexical','mobiledoc','@@UNIQUE_CONSTRAINTS@@'])).join(',');
+        // Because we're returning columns directly from the schema we need to remove info columns like @@UNIQUE_CONSTRAINTS@@ and @@INDEXES@@
+        frame.options.selectRaw = _.keys(_.omit(postsSchema, ['lexical','mobiledoc','@@INDEXES@@','@@UNIQUE_CONSTRAINTS@@'])).join(',');
     } else if (frame.options.columns) {
         frame.options.columns = frame.options.columns.filter((column) => {
             return !['mobiledoc', 'lexical'].includes(column);

package/core/server/data/migrations/versions/5.87/2024-06-25-12-08-20-add-posts-tags-post-tag-index.js

@@ -0,0 +1,26 @@
+const logging = require('@tryghost/logging');
+const {createNonTransactionalMigration} = require('../../utils');
+const {addIndex, dropIndex} = require('../../../schema/commands');
+
+module.exports = createNonTransactionalMigration(
+    async function up(knex) {
+        await addIndex('posts_tags', ['post_id', 'tag_id'], knex);
+    },
+    async function down(knex) {
+        try {
+            await dropIndex('posts_tags', ['post_id', 'tag_id'], knex);
+        } catch (err) {
+            if (err.code === 'ER_DROP_INDEX_FK') {
+                logging.error({
+                    message: 'Error dropping index over posts_tags(post_id, tag_id), re-adding index for post_id'
+                });
+
+                await addIndex('posts_tags', ['post_id'], knex);
+                await dropIndex('posts_tags', ['post_id', 'tag_id'], knex);
+                return;
+            }
+
+            throw err;
+        }
+    }
+);

package/core/server/data/migrations/versions/5.87/2024-06-25-12-08-45-add-posts-type-status-updated-at-index.js

@@ -0,0 +1,4 @@
+// For information on writing migrations, see https://www.notion.so/ghost/Database-migrations-eb5b78c435d741d2b34a582d57c24253
+const {createAddIndexMigration} = require('../../utils');
+
+module.exports = createAddIndexMigration('posts',['type','status','updated_at']);

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

@@ -93,6 +93,9 @@ module.exports = {
         canonical_url: {type: 'text', maxlength: 2000, nullable: true},
         newsletter_id: {type: 'string', maxlength: 24, nullable: true, references: 'newsletters.id'},
         show_title_and_feature_image: {type: 'boolean', nullable: false, defaultTo: true},
+        '@@INDEXES@@': [
+            ['type','status','updated_at']
+        ],
         '@@UNIQUE_CONSTRAINTS@@': [
             ['slug', 'type']
         ]
@@ -295,7 +298,10 @@ module.exports = {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},
         post_id: {type: 'string', maxlength: 24, nullable: false, references: 'posts.id'},
         tag_id: {type: 'string', maxlength: 24, nullable: false, references: 'tags.id'},
-        sort_order: {type: 'integer', nullable: false, unsigned: true, defaultTo: 0}
+        sort_order: {type: 'integer', nullable: false, unsigned: true, defaultTo: 0},
+        '@@INDEXES@@': [
+            ['post_id','tag_id']
+        ]
     },
     invites: {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},

package/core/server/models/base/plugins/crud.js

@@ -120,6 +120,11 @@ module.exports = function (Bookshelf) {
                 });
             }
 
+            //option param to skip distinct from count query, distinct adds a lot of latency and in this case the result set will always be unique.
+            if (unfilteredOptions.useBasicCount) {
+                options.useBasicCount = unfilteredOptions.useBasicCount;
+            }
+
             const response = await itemCollection.fetchPage(options);
             // Attributes are being filtered here, so they are not leaked into calling layer
             // where models are serialized to json and do not do more filtering.

package/core/server/web/parent/app.js

@@ -29,7 +29,7 @@ module.exports = function setupParentApp() {
     // Enable request queuing if configured
     const queueConfig = config.get('optimization:requestQueue');
 
-    if (queueConfig?.enabled === true) {
+    if (queueConfig) {
         parentApp.use(mw.queueRequest(queueConfig));
     }