ghost 5.58.0 → 5.59.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%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.58%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%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%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.59%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%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-683e596baef13faeef904df69817ee4c.css" title="light">
+    <link integrity="" rel="stylesheet" href="assets/ghost-8b4c354fc3f7c2d3cf40ddae14796922.css" title="light">
 
     
 </head>
@@ -56,9 +56,9 @@
 
     <div id="ember-basic-dropdown-wormhole"></div>
 
-    <script src="assets/vendor-16709e2a05d1300febb44b2e8f759976.js"></script>
-<script src="assets/chunk.757.ada6ed049fa8078cd416.js"></script>
-<script src="assets/chunk.143.5173fd8491cb28bc6a86.js"></script>
-    <script src="assets/ghost-1ab7ddfda5747da72ff210c8e4a68d6a.js"></script>
+    <script src="assets/vendor-fff5b0b3c122441beb3170947ae27b9d.js"></script>
+<script src="assets/chunk.757.ebdeaa01b967d376207e.js"></script>
+<script src="assets/chunk.143.361ded5611b0566d5e16.js"></script>
+    <script src="assets/ghost-44831979758d416ac112014cc3606e48.js"></script>
 </body>
 </html>

package/core/frontend/apps/amp/lib/views/amp.hbs

@@ -385,7 +385,7 @@
     }
 
     .kg-bookmark-card,
-    .kg-bookmark-author {
+    .kg-bookmark-publisher {
         position: relative;
     }
 
@@ -475,7 +475,7 @@
         overflow: hidden;
     }
 
-    .kg-bookmark-author::before {
+    .kg-bookmark-publisher::before {
         content: "•";
         margin: 0 .5em;
     }

package/core/frontend/helpers/ghost_head.js

@@ -45,9 +45,11 @@ function finaliseStructuredData(meta) {
 }
 
 function getMembersHelper(data, frontendKey) {
-    if (!settingsCache.get('members_enabled')) {
+    // Do not load Portal if both Memberships and Tips & Donations are disabled
+    if (!settingsCache.get('members_enabled') && !settingsCache.get('donations_enabled')) {
         return '';
     }
+
     const {scriptUrl} = getFrontendAppConfig('portal');
 
     const colorString = (_.has(data, 'site._preview') && data.site.accent_color) ? data.site.accent_color : '';

package/core/frontend/services/data/checks.js

@@ -3,6 +3,10 @@ function isPost(jsonData) {
         Object.prototype.hasOwnProperty.call(jsonData, 'title') && Object.prototype.hasOwnProperty.call(jsonData, 'slug');
 }
 
+function isPage(jsonData = {}) {
+    return Object.prototype.hasOwnProperty.call(jsonData, 'show_title_and_feature_image');
+}
+
 function isTag(jsonData) {
     return Object.prototype.hasOwnProperty.call(jsonData, 'name') && Object.prototype.hasOwnProperty.call(jsonData, 'slug') &&
         Object.prototype.hasOwnProperty.call(jsonData, 'description') && Object.prototype.hasOwnProperty.call(jsonData, 'feature_image');
@@ -20,6 +24,7 @@ function isNav(jsonData) {
 
 module.exports = {
     isPost,
+    isPage,
     isTag,
     isUser,
     isNav

package/core/frontend/services/proxy.js

@@ -26,10 +26,10 @@ module.exports = {
             if (resource.feature_image_caption) {
                 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;
+            // some properties are extracted to local template data to force one way of using it
+            delete resource.show_title_and_feature_image;
+        });
     },
 
     /**

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

@@ -1,13 +1,14 @@
 const _ = require('lodash');
 const hbs = require('../theme-engine/engine');
 const {prepareContextResource} = require('../proxy');
+const {isPage} = require('../data/checks');
 
 /**
  * @description Formats API response into handlebars/theme format.
  *
  * @return {Object} containing page variables
  */
-function formatPageResponse(result, pageAsPost = false) {
+function formatPageResponse(result, pageAsPost = false, locals = {}) {
     const response = {};
 
     if (result.posts) {
@@ -19,6 +20,28 @@ function formatPageResponse(result, pageAsPost = false) {
         response.pagination = result.meta.pagination;
     }
 
+    // when a custom routed page is loaded it can have an associated page object,
+    // in that case we want to make sure @page is still available and matches the
+    // selected page properties
+    if (isPage(result.data?.page?.[0])) {
+        const page = result.data?.page?.[0];
+
+        // 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: page.show_title_and_feature_image
+        };
+
+        // merge @page into local template options
+        const localTemplateOptions = hbs.getLocalTemplateOptions(locals);
+        hbs.updateLocalTemplateOptions(locals, _.merge({}, localTemplateOptions, {
+            data: {
+                page: pageData
+            }
+        }));
+    }
+
     _.each(result.data, function (data, name) {
         prepareContextResource(data);
 

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

@@ -14,6 +14,6 @@ module.exports = function renderEntries(req, res) {
     return function renderEntriesClosure(result) {
         // Format data 2
         // Render
-        return renderer(req, res, formatResponse.entries(result));
+        return renderer(req, res, formatResponse.entries(result, false, res.locals));
     };
 };

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

@@ -65,7 +65,7 @@ module.exports = function staticController(req, res, next) {
             // This flag solves the confusion about whether the output contains a post or page object by duplicating the objects
             // This is not ideal, but will solve some long standing pain points with dynamic routing until we can overhaul it
             const duplicatePagesAsPosts = true;
-            renderer.renderer(req, res, renderer.formatResponse.entries(response, duplicatePagesAsPosts));
+            renderer.renderer(req, res, renderer.formatResponse.entries(response, duplicatePagesAsPosts, res.locals));
         })
         .catch(renderer.handleError(next));
 };

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

@@ -4,9 +4,9 @@
 }
 
 .kg-bookmark-card,
-.kg-bookmark-author {
+.kg-bookmark-publisher {
     position: relative;
-    width: 100%;
+    /* width: 100%; */
 }
 
 .kg-bookmark-card a.kg-bookmark-container,
@@ -74,7 +74,7 @@
     display: inline;
 }
 
-.kg-bookmark-author {
+.kg-bookmark-publisher {
     text-overflow: ellipsis;
     overflow: hidden;
     max-width: 240px;

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

@@ -19,6 +19,10 @@
     background-color: var(--ghost-accent-color);
 }
 
+.kg-header-card-content {
+    width: 100%;
+}
+
 .kg-layout-split .kg-header-card-content {
     display: grid;
     grid-template-columns: 1fr 1fr;
@@ -31,14 +35,14 @@
     align-items: flex-start;
     justify-content: center;
     height: 100%;
-    padding: 4vmax;
+    padding: 6.4vmax 4vmax;
     background-size: cover;
     background-position: center;
     text-align: left;
 }
 
 .kg-width-wide .kg-header-card-text {
-    padding: 6.4vmax;
+    padding: 10vmax 6.4vmax;
 }
 
 .kg-width-full .kg-header-card-text {

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

@@ -141,6 +141,7 @@ module.exports = {
             'source',
             'force_rerender',
             'save_revision',
+            'convert_to_lexical',
             // NOTE: only for internal context
             'forUpdate',
             'transacting'

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

@@ -192,6 +192,7 @@ module.exports = {
             'newsletter',
             'force_rerender',
             'save_revision',
+            'convert_to_lexical',
             // NOTE: only for internal context
             'forUpdate',
             'transacting'

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

@@ -68,7 +68,9 @@ const EDITABLE_SETTINGS = [
     'announcement_visibility',
     'pintura',
     'pintura_js_url',
-    'pintura_css_url'
+    'pintura_css_url',
+    'donations_currency',
+    'donations_suggested_amount'
 ];
 
 module.exports = {

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

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

package/core/server/data/migrations/versions/5.59/2023-08-07-10-42-add-donation-notifications-column.js

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

package/core/server/data/migrations/versions/5.59/2023-08-07-11-17-05-add-posts-published-at-index.js

@@ -0,0 +1,51 @@
+const logging = require('@tryghost/logging');
+const DatabaseInfo = require('@tryghost/database-info');
+const {createNonTransactionalMigration} = require('../../utils');
+
+const INDEX_NAME = 'posts_published_at_index';
+
+module.exports = createNonTransactionalMigration(
+    async function up(knex) {
+        let hasIndex = false;
+
+        if (DatabaseInfo.isSQLite(knex)) {
+            const result = await knex.raw(`select * from sqlite_master where type = 'index' and tbl_name = 'posts' and name = '${INDEX_NAME}'`);
+            hasIndex = (result.length !== 0);
+        } else {
+            const result = await knex.raw(`show index from posts where Key_name = '${INDEX_NAME}'`);
+            hasIndex = (result[0].length !== 0);
+        }
+
+        if (hasIndex) {
+            logging.info(`Skipping creation of index ${INDEX_NAME} on posts for published_at - already exists`);
+            return;
+        }
+
+        logging.info(`Creating index ${INDEX_NAME} on posts for published_at`);
+        await knex.schema.table('posts', (table) => {
+            table.index(['published_at']);
+        });
+    },
+
+    async function down(knex) {
+        let missingIndex = false;
+
+        if (DatabaseInfo.isSQLite(knex)) {
+            const result = await knex.raw(`select * from sqlite_master where type = 'index' and tbl_name = 'posts' and name = '${INDEX_NAME}'`);
+            missingIndex = (result.length === 0);
+        } else {
+            const result = await knex.raw(`show index from posts where Key_name = '${INDEX_NAME}'`);
+            missingIndex = (result[0].length === 0);
+        }
+
+        if (missingIndex) {
+            logging.info(`Skipping drop of index ${INDEX_NAME} on posts for published_at - does not exist`);
+            return;
+        }
+
+        logging.info(`Dropping index ${INDEX_NAME} on posts for published_at`);
+        await knex.schema.table('posts', (table) => {
+            table.dropIndex(['published_at']);
+        });
+    }
+);

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

@@ -700,6 +700,7 @@
                     "free_member_signup_notification": true,
                     "paid_subscription_started_notification": true,
                     "paid_subscription_canceled_notification": false,
+                    "donation_notifications": true,
                     "roles": []
                 }
             ]

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

@@ -83,7 +83,7 @@ module.exports = {
         created_by: {type: 'string', maxlength: 24, nullable: false},
         updated_at: {type: 'dateTime', nullable: true},
         updated_by: {type: 'string', maxlength: 24, nullable: true},
-        published_at: {type: 'dateTime', nullable: true},
+        published_at: {type: 'dateTime', nullable: true, index: true},
         published_by: {type: 'string', maxlength: 24, nullable: true},
         custom_excerpt: {type: 'string', maxlength: 2000, nullable: true, validations: {isLength: {max: 300}}},
         codeinjection_head: {type: 'text', maxlength: 65535, nullable: true},
@@ -164,6 +164,7 @@ module.exports = {
         paid_subscription_canceled_notification: {type: 'boolean', nullable: false, defaultTo: false},
         mention_notifications: {type: 'boolean', nullable: false, defaultTo: true},
         milestone_notifications: {type: 'boolean', nullable: false, defaultTo: true},
+        donation_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},

package/core/server/models/collection-post.js

@@ -0,0 +1,9 @@
+const ghostBookshelf = require('./base');
+
+const CollectionPost = ghostBookshelf.Model.extend({
+    tableName: 'collections_posts'
+});
+
+module.exports = {
+    CollectionPost: ghostBookshelf.model('CollectionPost', CollectionPost)
+};

package/core/server/models/collection.js

@@ -70,6 +70,12 @@ const Collection = ghostBookshelf.Model.extend({
             'id',
             'id'
         );
+    },
+
+    collectionPosts() {
+        return this.hasMany(
+            'CollectionPost'
+        );
     }
 });
 

package/core/server/models/post.js

@@ -19,6 +19,8 @@ const {Tag} = require('./tag');
 const {Newsletter} = require('./newsletter');
 const {BadRequestError} = require('@tryghost/errors');
 const {PostRevisions} = require('@tryghost/post-revisions');
+const {mobiledocToLexical} = require('@tryghost/kg-converters');
+const labs = require('../../shared/labs');
 
 const messages = {
     isAlreadyPublished: 'Your post is already published, please reload your page.',
@@ -913,6 +915,16 @@ Post = ghostBookshelf.Model.extend({
             });
         }
 
+        // CASE: Convert post to lexical on the fly
+        if (labs.isSet('convertToLexical') && labs.isSet('lexicalEditor') && options.convert_to_lexical) {
+            ops.push(async function convertToLexical() {
+                const mobiledoc = model.get('mobiledoc');
+                const lexical = mobiledocToLexical(mobiledoc);
+                model.set('lexical', lexical);
+                model.set('mobiledoc', null);
+            });
+        }
+
         if (this.get('tiers')) {
             this.set('tiers', this.get('tiers').map(t => ({
                 id: t.id
@@ -1154,9 +1166,10 @@ Post = ghostBookshelf.Model.extend({
         const validOptions = {
             findOne: ['columns', 'importing', 'withRelated', 'require', 'filter'],
             findPage: ['status'],
+
             findAll: ['columns', 'filter'],
             destroy: ['destroyAll', 'destroyBy'],
-            edit: ['filter', 'email_segment', 'force_rerender', 'newsletter', 'save_revision']
+            edit: ['filter', 'email_segment', 'force_rerender', 'newsletter', 'save_revision', 'convert_to_lexical']
         };
 
         // The post model additionally supports having a formats option

package/core/server/models/user.js

@@ -69,7 +69,8 @@ User = ghostBookshelf.Model.extend({
             paid_subscription_started_notification: true,
             paid_subscription_canceled_notification: false,
             mention_notifications: true,
-            milestone_notifications: true
+            milestone_notifications: true,
+            donation_notifications: true
         };
     },
 
@@ -509,6 +510,8 @@ User = ghostBookshelf.Model.extend({
             filter += '+mention_notifications:true';
         } else if (type === 'milestone-received') {
             filter += '+milestone_notifications:true';
+        } else if (type === 'donation') {
+            filter += '+donation_notifications:true';
         }
         const updatedOptions = _.merge({}, options, {filter, withRelated: ['roles']});
         return this.findAll(updatedOptions).then((users) => {

package/core/server/services/collections/BookshelfCollectionsRepository.js

@@ -23,7 +23,7 @@ module.exports = class BookshelfCollectionsRepository {
     async getById(id, options = {}) {
         const model = await this.#model.findOne({id}, {
             require: false,
-            withRelated: ['posts'],
+            withRelated: ['collectionPosts'],
             transacting: options.transaction
         });
         if (!model) {
@@ -39,7 +39,7 @@ module.exports = class BookshelfCollectionsRepository {
     async getBySlug(slug, options = {}) {
         const model = await this.#model.findOne({slug}, {
             require: false,
-            withRelated: ['posts'],
+            withRelated: ['collectionPosts'],
             transacting: options.transaction
         });
         if (!model) {
@@ -58,7 +58,7 @@ module.exports = class BookshelfCollectionsRepository {
         const models = await this.#model.findAll({
             ...options,
             transacting: options.transaction,
-            withRelated: ['posts']
+            withRelated: ['collectionPosts']
         });
 
         return await Promise.all(models.map(model => this.#modelToCollection(model)));
@@ -75,7 +75,7 @@ module.exports = class BookshelfCollectionsRepository {
             filter: json.filter,
             type: json.type,
             featureImage: json.feature_image,
-            posts: json.posts.map(post => post.id),
+            posts: json.collectionPosts.map(collectionPost => collectionPost.post_id),
             createdAt: json.created_at,
             updatedAt: json.updated_at
         });

package/core/server/services/members/api.js

@@ -182,6 +182,7 @@ function createApiInstance(config) {
             }
         },
         models: {
+            DonationPaymentEvent: models.DonationPaymentEvent,
             EmailRecipient: models.EmailRecipient,
             StripeCustomer: models.MemberStripeCustomer,
             StripeCustomerSubscription: models.StripeCustomerSubscription,

package/core/server/services/settings/settings-service.js

@@ -89,6 +89,7 @@ module.exports = {
         fields.push(new CalculatedField({key: 'members_invite_only', type: 'boolean', group: 'members', fn: settingsHelpers.isMembersInviteOnly.bind(settingsHelpers), dependents: ['members_signup_access']}));
         fields.push(new CalculatedField({key: 'paid_members_enabled', type: 'boolean', group: 'members', fn: settingsHelpers.arePaidMembersEnabled.bind(settingsHelpers), dependents: ['members_signup_access', 'stripe_secret_key', 'stripe_publishable_key', 'stripe_connect_secret_key', 'stripe_connect_publishable_key']}));
         fields.push(new CalculatedField({key: 'firstpromoter_account', type: 'string', group: 'firstpromoter', fn: settingsHelpers.getFirstpromoterId.bind(settingsHelpers), dependents: ['firstpromoter', 'firstpromoter_id']}));
+        fields.push(new CalculatedField({key: 'donations_enabled', type: 'boolean', group: 'donations', fn: settingsHelpers.areDonationsEnabled.bind(settingsHelpers), dependents: ['stripe_secret_key', 'stripe_publishable_key', 'stripe_connect_secret_key', 'stripe_connect_publishable_key']}));
 
         return fields;
     },

package/core/server/services/settings-helpers/SettingsHelpers.js

@@ -98,6 +98,10 @@ class SettingsHelpers {
     getNoReplyAddress() {
         return `noreply@${this.getDefaultEmailDomain()}`;
     }
+
+    areDonationsEnabled() {
+        return this.isStripeConnected();
+    }
 }
 
 module.exports = SettingsHelpers;

package/core/server/services/stripe/service.js

@@ -10,6 +10,7 @@ const models = require('../../models');
 const {getConfig} = require('./config');
 const settingsHelpers = require('../settings-helpers');
 const donationService = require('../donations');
+const staffService = require('../staff');
 
 async function configureApi() {
     const cfg = getConfig({settingsHelpers, config, urlUtils});
@@ -56,7 +57,8 @@ module.exports = new StripeService({
             }]);
         }
     },
-    donationService
+    donationService,
+    staffService
 });
 
 module.exports.init = async function init() {

package/core/shared/config/defaults.json

@@ -182,7 +182,7 @@
     },
     "portal": {
         "url": "https://cdn.jsdelivr.net/ghost/portal@~{version}/umd/portal.min.js",
-        "version": "2.33"
+        "version": "2.34"
     },
     "sodoSearch": {
         "url": "https://cdn.jsdelivr.net/ghost/sodo-search@~{version}/umd/sodo-search.min.js",
@@ -200,7 +200,7 @@
     },
     "editor": {
         "url": "https://cdn.jsdelivr.net/ghost/koenig-lexical@~{version}/dist/koenig-lexical.umd.js",
-        "version": "0.3"
+        "version": "0.4"
     },
     "adminX": {
         "url": "https://cdn.jsdelivr.net/ghost/admin-x-settings@~{version}/dist/admin-x-settings.umd.js",

package/core/shared/labs.js

@@ -40,9 +40,9 @@ const ALPHA_FEATURES = [
     'adminXSettings',
     'mailEvents',
     'collectionsCard',
-    'headerUpgrade',
+    'tipsAndDonations',
     'importMemberTier',
-    'tipsAndDonations'
+    'convertToLexical'
 ];
 
 module.exports.GA_KEYS = [...GA_FEATURES];