ghost 5.53.4 → 5.54.1

package/core/frontend/services/data/fetch-data.js

@@ -3,7 +3,6 @@
  * Dynamically build and execute queries on the API
  */
 const _ = require('lodash');
-const Promise = require('bluebird');
 
 // The default settings for a default post query
 const queryDefaults = {
@@ -64,7 +63,7 @@ function processQuery(query, slugParam, locals) {
  * Fetch data from API helper for controllers.
  *
  * Calls out to get posts per page, builds the final posts query & builds any additional queries
- * Wraps the queries using Promise.props to ensure it gets named responses
+ * Uses Promise.all to handle the queries and ensure concurrent execution.
  * Does a first round of formatting on the response, and returns
  */
 function fetchData(pathOptions, routerOptions, locals) {
@@ -72,7 +71,7 @@ function fetchData(pathOptions, routerOptions, locals) {
     routerOptions = routerOptions || {};
 
     let postQuery = _.cloneDeep(defaultPostQuery);
-    let props = {};
+    let promises = [];
 
     if (routerOptions.filter) {
         postQuery.options.filter = routerOptions.filter;
@@ -92,26 +91,32 @@ function fetchData(pathOptions, routerOptions, locals) {
 
     // CASE: always fetch post entries
     // The filter can in theory contain a "%s" e.g. filter="primary_tag:%s"
-    props.posts = processQuery(postQuery, pathOptions.slug, locals);
+    promises.push(processQuery(postQuery, pathOptions.slug, locals));
 
     // CASE: fetch more data defined by the router e.g. tags, authors - see TaxonomyRouter
     _.each(routerOptions.data, function (query, name) {
         const dataQueryOptions = _.merge(query, defaultDataQueryOptions[name]);
-        props[name] = processQuery(dataQueryOptions, pathOptions.slug, locals);
+        promises.push(processQuery(dataQueryOptions, pathOptions.slug, locals));
     });
 
-    return Promise.props(props)
+    return Promise.all(promises)
         .then(function formatResponse(results) {
-            const response = _.cloneDeep(results.posts);
+            const response = _.cloneDeep(results[0]);
 
             if (routerOptions.data) {
                 response.data = {};
 
+                let resultIndex = 1;
+
                 _.each(routerOptions.data, function (config, name) {
-                    response.data[name] = results[name][config.resource];
+                    if (results[resultIndex]) {
+                        response.data[name] = results[resultIndex][config.resource];
+
+                        if (config.type === 'browse') {
+                            response.data[name].meta = results[resultIndex].meta;
+                        }
 
-                    if (config.type === 'browse') {
-                        response.data[name].meta = results[name].meta;
+                        resultIndex = resultIndex + 1;
                     }
                 });
             }

package/core/frontend/services/proxy.js

@@ -27,6 +27,9 @@ module.exports = {
                 resource.feature_image_caption = new SafeString(resource.feature_image_caption);
             }
         });
+
+        // some properties are extracted to local template data to force one way of using it
+        delete data.show_title_and_feature_image;
     },
 
     /**

package/core/frontend/services/rendering/format-response.js

@@ -1,4 +1,5 @@
 const _ = require('lodash');
+const hbs = require('../theme-engine/engine');
 const {prepareContextResource} = require('../proxy');
 
 /**
@@ -50,7 +51,17 @@ function formatPageResponse(result, pageAsPost = false) {
  *
  * @return {Object} containing page variables
  */
-function formatResponse(post, context) {
+function formatResponse(post, context, locals = {}) {
+    // build up @page data for use in templates
+    // - done here rather than `update-local-template-options` middleware because
+    //   we need access to the rendered entry's data which isn't available in middleware
+    const pageData = {
+        show_title_and_feature_image: true // default behaviour
+    };
+
+    // grab data off of the post that will be deleted in prepareContextResource
+    const showTitleAndFeatureImage = post.show_title_and_feature_image;
+
     prepareContextResource(post);
 
     let entry = {
@@ -60,8 +71,23 @@ function formatResponse(post, context) {
     // NOTE: preview context is a special case where the internal preview api returns the post model's type field
     if (context?.includes('page') || (context?.includes('preview') && post.type === 'page')) {
         entry.page = post;
+
+        // move properties from the page context object onto @page
+        // - makes the value available outside of the page context
+        // - data is removed from the post object in prepareContextResource so use of @page is forced
+        if (showTitleAndFeatureImage !== undefined) {
+            pageData.show_title_and_feature_image = showTitleAndFeatureImage;
+        }
     }
 
+    // merge @page into local template options
+    const localTemplateOptions = hbs.getLocalTemplateOptions(locals);
+    hbs.updateLocalTemplateOptions(locals, _.merge({}, localTemplateOptions, {
+        data: {
+            page: pageData
+        }
+    }));
+
     return entry;
 }
 

package/core/frontend/services/rendering/render-entry.js

@@ -13,6 +13,6 @@ module.exports = function renderEntry(req, res) {
     return function renderEntryClosure(entry) {
         // Format data 2 - 1 is in preview/entry
         // Render
-        return renderer(req, res, formatResponse.entry(entry, res.routerOptions?.context));
+        return renderer(req, res, formatResponse.entry(entry, res.routerOptions?.context, res.locals));
     };
 };

package/core/frontend/services/routing/controllers/static.js

@@ -1,5 +1,4 @@
 const _ = require('lodash');
-const Promise = require('bluebird');
 const debug = require('@tryghost/debug')('services:routing:controllers:static');
 const renderer = require('../../rendering');
 
@@ -36,27 +35,30 @@ function processQuery(query, locals) {
 module.exports = function staticController(req, res, next) {
     debug('staticController', res.routerOptions);
 
-    let props = {};
+    let promises = [];
 
-    _.each(res.routerOptions.data, function (query, name) {
-        props[name] = processQuery(query, res.locals);
+    _.each(res.routerOptions.data, function (query) {
+        promises.push(processQuery(query, res.locals));
     });
 
-    return Promise.props(props)
+    return Promise.all(promises)
         .then(function handleResult(result) {
             let response = {};
 
             if (res.routerOptions.data) {
                 response.data = {};
 
+                let resultIndex = 0;
                 _.each(res.routerOptions.data, function (config, name) {
-                    response.data[name] = result[name][config.resource];
+                    response.data[name] = result[resultIndex][config.resource];
 
                     if (config.type === 'browse') {
-                        response.data[name].meta = result[name].meta;
+                        response.data[name].meta = result[resultIndex].meta;
                         // @TODO: remove in Ghost 3.0 (see https://github.com/TryGhost/Ghost/issues/10434)
-                        response.data[name][config.resource] = result[name][config.resource];
+                        response.data[name][config.resource] = result[resultIndex][config.resource];
                     }
+
+                    resultIndex = resultIndex + 1;
                 });
             }
 

package/core/frontend/services/rss/generate-feed.js

@@ -1,5 +1,4 @@
 const downsize = require('downsize');
-const Promise = require('bluebird');
 const RSS = require('rss');
 const urlUtils = require('../../../shared/url-utils');
 const {routerManager} = require('../routing');

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

@@ -39,19 +39,19 @@
 }
 
 .kg-width-full .kg-signup-card-text {
-    padding: 9.6vmax 0;
+    padding: 12vmax 0;
 }
 
 .kg-layout-split .kg-signup-card-text {
-    padding: 9.6vmax 4vmax;
+    padding: 12vmax 4vmax;
 }
 
 .kg-layout-split.kg-content-wide .kg-signup-card-text {
-    padding: 9.6vmax 0 9.6vmax 4vmax;
+    padding: 10vmax 0 10vmax 4vmax;
 }
 
 .kg-layout-split.kg-content-wide.kg-swapped .kg-signup-card-text {
-    padding: 9.6vmax 4vmax 9.6vmax 0;
+    padding: 10vmax 4vmax 10vmax 0;
 }
 
 .kg-swapped .kg-signup-card-text {

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

@@ -4,7 +4,6 @@ const serveStatic = require('../../../shared/express').static;
 
 const fs = require('fs-extra');
 const path = require('path');
-const Promise = require('bluebird');
 const moment = require('moment');
 const tpl = require('@tryghost/tpl');
 const logging = require('@tryghost/logging');

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

@@ -1,4 +1,3 @@
-const Promise = require('bluebird');
 const api = require('./index');
 const config = require('../../../shared/config');
 const tpl = require('@tryghost/tpl');

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

@@ -1,4 +1,3 @@
-const Promise = require('bluebird');
 const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 const {mapQuery} = require('@tryghost/mongo-utils');

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

@@ -1,10 +1,10 @@
-const Promise = require('bluebird');
 const moment = require('moment-timezone');
 const dbBackup = require('../../data/db/backup');
 const exporter = require('../../data/exporter');
 const importer = require('../../data/importer');
 const mediaInliner = require('../../services/media-inliner');
 const errors = require('@tryghost/errors');
+const {pool} = require('@tryghost/promise');
 const models = require('../../models');
 const settingsCache = require('../../../shared/settings-cache');
 
@@ -151,15 +151,15 @@ module.exports = {
 
                     return models.Post.findAll(queryOpts)
                         .then((response) => {
-                            return Promise.map(response.models, (post) => {
+                            return pool(response.models.map(post => () => {
                                 return models.Post.destroy(Object.assign({id: post.id}, queryOpts));
-                            }, {concurrency: 100});
+                            }), 100);
                         })
                         .then(() => models.Tag.findAll(queryOpts))
                         .then((response) => {
-                            return Promise.map(response.models, (tag) => {
+                            return pool(response.models.map(tag => () => {
                                 return models.Tag.destroy(Object.assign({id: tag.id}, queryOpts));
-                            }, {concurrency: 100});
+                            }), 100);
                         })
                         .catch((err) => {
                             throw new errors.InternalServerError({

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

@@ -1,4 +1,3 @@
-const Promise = require('bluebird');
 const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 const invites = require('../../services/invites');

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

@@ -1,4 +1,3 @@
-const Promise = require('bluebird');
 const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 const models = require('../../models');

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

@@ -1,4 +1,3 @@
-const Promise = require('bluebird');
 const tpl = require('@tryghost/tpl');
 const mailService = require('../../services/mail');
 const api = require('./');

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

@@ -1,4 +1,3 @@
-const Promise = require('bluebird');
 const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 const models = require('../../models');

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

@@ -1,4 +1,3 @@
-const Promise = require('bluebird');
 const errors = require('@tryghost/errors');
 const tpl = require('@tryghost/tpl');
 const models = require('../../models');

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

@@ -1,4 +1,3 @@
-const Promise = require('bluebird');
 const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 const models = require('../../models');

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

@@ -1,4 +1,3 @@
-const Promise = require('bluebird');
 const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 const models = require('../../models');

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

@@ -1,4 +1,3 @@
-const Promise = require('bluebird');
 const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 const models = require('../../models');

package/core/server/api/endpoints/utils/permissions.js

@@ -1,5 +1,4 @@
 const debug = require('@tryghost/debug')('api:endpoints:utils:permissions');
-const Promise = require('bluebird');
 const _ = require('lodash');
 const permissions = require('../../../services/permissions');
 const tpl = require('@tryghost/tpl');

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

@@ -29,7 +29,7 @@ module.exports = async (model, frame, options = {}) => {
     if (typeof model.toJSON === 'function') {
         jsonModel = model.toJSON(frame.options);
     } else {
-        // This is to satisy the interface which extraAttrs needs
+        // This is to satisfy the interface which extraAttrs needs
         model = {
             id: jsonModel.id,
             get(attr) {

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

@@ -1,4 +1,3 @@
-const Promise = require('bluebird');
 const debug = require('@tryghost/debug')('api:endpoints:utils:serializers:output:roles');
 const canThis = require('../../../../../services/permissions').canThis;
 
@@ -13,17 +12,23 @@ module.exports = {
                 roles: roles
             };
         } else {
-            return Promise.filter(roles.map((role) => {
-                return canThis(frame.options.context).assign.role(role)
-                    .return(role)
-                    .catch(() => {});
-            }), (value) => {
-                return value && (value.name !== 'Owner');
-            }).then((filteredRoles) => {
-                return frame.response = {
-                    roles: filteredRoles
-                };
-            });
+            return Promise.all(
+                roles.map(async (role) => {
+                    let permissionResult;
+                    try {
+                        await canThis(frame.options.context).assign.role(role);
+                        permissionResult = role;
+                    } catch (err) {
+                        permissionResult = {};
+                    }
+                    return permissionResult && permissionResult.name && (permissionResult.name !== 'Owner');   
+                }))
+                .then(results => roles.filter((_v, index) => results[index]))   
+                .then((filteredRoles) => {
+                    return frame.response = {
+                        roles: filteredRoles
+                    };
+                });
         }
     }
 };

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

@@ -126,6 +126,10 @@ const post = (attrs, frame) => {
         delete attrs.primary_author;
     }
 
+    if (attrs.type !== 'page') {
+        delete attrs.show_title_and_feature_image;
+    }
+
     delete attrs.locale;
     delete attrs.author;
     delete attrs.type;

package/core/server/api/endpoints/utils/validators/input/invitations.js

@@ -1,4 +1,3 @@
-const Promise = require('bluebird');
 const validator = require('@tryghost/validator');
 const debug = require('@tryghost/debug')('api:endpoints:utils:validators:input:invitation');
 const tpl = require('@tryghost/tpl');

package/core/server/api/endpoints/utils/validators/input/invites.js

@@ -1,4 +1,3 @@
-const Promise = require('bluebird');
 const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 const models = require('../../../../../models');

package/core/server/api/endpoints/utils/validators/input/oembed.js

@@ -1,4 +1,3 @@
-const Promise = require('bluebird');
 const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 

package/core/server/api/endpoints/utils/validators/input/password_reset.js

@@ -1,5 +1,4 @@
 /* eslint-disable ghost/filenames/match-regex */
-const Promise = require('bluebird');
 const validator = require('@tryghost/validator');
 const debug = require('@tryghost/debug')('api:endpoints:utils:validators:input:passwordreset');
 const tpl = require('@tryghost/tpl');

package/core/server/api/endpoints/utils/validators/input/settings.js

@@ -1,4 +1,3 @@
-const Promise = require('bluebird');
 const _ = require('lodash');
 const {ValidationError} = require('@tryghost/errors');
 const validator = require('@tryghost/validator');

package/core/server/api/endpoints/utils/validators/input/users.js

@@ -1,4 +1,3 @@
-const Promise = require('bluebird');
 const debug = require('@tryghost/debug')('api:endpoints:utils:validators:input:users');
 const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');

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

@@ -237,7 +237,7 @@ class PostsImporter extends BaseImporter {
             // CASE 1: you are importing old editor posts
             // CASE 2: you are importing Koenig Beta posts
             // CASE 3: you are importing Koenig 2.0 posts
-            if (model.mobiledoc) {
+            if (model.mobiledoc && !model.lexical) {
                 let mobiledoc;
 
                 try {
@@ -272,7 +272,7 @@ class PostsImporter extends BaseImporter {
 
                 model.mobiledoc = JSON.stringify(mobiledoc);
                 model.html = mobiledocLib.mobiledocHtmlRenderer.render(JSON.parse(model.mobiledoc));
-            } else if (model.html) {
+            } else if (model.html && !model.lexical) {
                 model.mobiledoc = JSON.stringify(mobiledocLib.htmlToMobiledocConverter(model.html));
                 model.html = mobiledocLib.mobiledocHtmlRenderer.render(JSON.parse(model.mobiledoc));
             }

package/core/server/data/migrations/hooks/init/before.js

@@ -1,4 +1,3 @@
-const Promise = require('bluebird');
 const models = require('../../../../models');
 
 module.exports = function before() {

package/core/server/data/migrations/hooks/migrate/afterEach.js

@@ -1,5 +1,4 @@
 /* eslint-disable ghost/filenames/match-regex */
-const Promise = require('bluebird');
 
 module.exports = function afterEach() {
     return Promise.resolve();

package/core/server/data/migrations/hooks/migrate/beforeEach.js

@@ -1,5 +1,4 @@
 /* eslint-disable ghost/filenames/match-regex */
-const Promise = require('bluebird');
 
 module.exports = function beforeEach() {
     return Promise.resolve();

package/core/server/data/migrations/versions/5.54/2023-07-07-11-57-add-show-title-and-feature-image-column-to-posts.js

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

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

@@ -1,5 +1,4 @@
 const _ = require('lodash');
-const Promise = require('bluebird');
 const logging = require('@tryghost/logging');
 const errors = require('@tryghost/errors');
 const tpl = require('@tryghost/tpl');

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

@@ -91,6 +91,7 @@ module.exports = {
         custom_template: {type: 'string', maxlength: 100, nullable: true},
         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},
         '@@UNIQUE_CONSTRAINTS@@': [
             ['slug', 'type']
         ]

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

@@ -1,6 +1,4 @@
 const _ = require('lodash');
-const Promise = require('bluebird');
-
 const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 const validator = require('@tryghost/validator');

package/core/server/lib/image/BlogIcon.js

@@ -1,5 +1,4 @@
 const sizeOf = require('image-size');
-const Promise = require('bluebird');
 const _ = require('lodash');
 const path = require('path');
 const errors = require('@tryghost/errors');
@@ -40,12 +39,12 @@ class BlogIcon {
                     }).height;
                 }
 
-                return resolve({
+                resolve({
                     width: dimensions.width,
                     height: dimensions.height
                 });
             } catch (err) {
-                return reject(new errors.ValidationError({
+                reject(new errors.ValidationError({
                     message: tpl(messages.error, {
                         file: storagePath,
                         error: err.message

package/core/server/lib/image/Gravatar.js

@@ -1,4 +1,3 @@
-const Promise = require('bluebird');
 const crypto = require('crypto');
 const tpl = require('@tryghost/tpl');
 

package/core/server/lib/image/ImageSize.js

@@ -3,7 +3,6 @@ const sizeOf = require('image-size');
 const probeSizeOf = require('probe-image-size');
 const url = require('url');
 const path = require('path');
-const Promise = require('bluebird');
 const _ = require('lodash');
 const errors = require('@tryghost/errors');
 const tpl = require('@tryghost/tpl');
@@ -59,9 +58,9 @@ class ImageSize {
                     dimensions.height = _.maxBy(dimensions.images, img => img.height).height;
                 }
 
-                return resolve(dimensions);
+                resolve(dimensions);
             } catch (err) {
-                return reject(err);
+                reject(err);
             }
         });
     }
@@ -113,9 +112,9 @@ class ImageSize {
             const extension = (extensionMatch[1] || '').toLowerCase();
 
             if (FETCH_ONLY_FORMATS.includes(extension)) {
-                return resolve(this._fetchImageSizeFromUrl(imageUrl));
+                resolve(this._fetchImageSizeFromUrl(imageUrl));
             } else {
-                return resolve(this._probeImageSizeFromUrl(imageUrl));
+                resolve(this._probeImageSizeFromUrl(imageUrl));
             }
         });
     }
@@ -344,12 +343,12 @@ class ImageSize {
                     }).height;
                 }
 
-                return resolve({
+                resolve({
                     width: dimensions.width,
                     height: dimensions.height
                 });
             } catch (err) {
-                return reject(new errors.ValidationError({
+                reject(new errors.ValidationError({
                     message: tpl(messages.invalidDimensions, {
                         file: imagePath,
                         error: err.message

package/core/server/models/base/listeners.js

@@ -3,7 +3,7 @@ const _ = require('lodash');
 const models = require('../../models');
 const logging = require('@tryghost/logging');
 const errors = require('@tryghost/errors');
-const Promise = require('bluebird');
+const {sequence} = require('@tryghost/promise');
 
 // Listen to settings.timezone.edited and settings.notifications.edited to bind extra logic to settings, similar to the bridge and member service
 const events = require('../../lib/common/events');
@@ -46,7 +46,7 @@ events.on('settings.timezone.edited', function (settingModel, options) {
                 return;
             }
 
-            await Promise.mapSeries(results, async (post) => {
+            await sequence(results.map(post => async () => {
                 const newPublishedAtMoment = moment(post.get('published_at')).add(timezoneOffsetDiff, 'minutes');
 
                 /**
@@ -73,7 +73,7 @@ events.on('settings.timezone.edited', function (settingModel, options) {
                         err
                     }));
                 }
-            });
+            }));
         } catch (err) {
             logging.error(new errors.InternalServerError({
                 err: err,

package/core/server/models/base/utils.js

@@ -4,7 +4,6 @@
  */
 const _ = require('lodash');
 
-const Promise = require('bluebird');
 const ObjectId = require('bson-objectid').default;
 const errors = require('@tryghost/errors');
 

package/core/server/models/invite.js

@@ -1,4 +1,3 @@
-const Promise = require('bluebird');
 const _ = require('lodash');
 const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');

package/core/server/models/post.js

@@ -2,7 +2,6 @@
 const _ = require('lodash');
 const uuid = require('uuid');
 const moment = require('moment');
-const Promise = require('bluebird');
 const {sequence} = require('@tryghost/promise');
 const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
@@ -94,7 +93,8 @@ Post = ghostBookshelf.Model.extend({
             type: 'post',
             tiers,
             visibility: visibility,
-            email_recipient_filter: 'all'
+            email_recipient_filter: 'all',
+            show_title_and_feature_image: true
         };
     },
 

package/core/server/models/role.js

@@ -1,6 +1,5 @@
 const _ = require('lodash');
 const ghostBookshelf = require('./base');
-const Promise = require('bluebird');
 const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');