ghost 5.64.0 → 5.65.0

package/core/server/models/post.js

@@ -367,6 +367,47 @@ Post = ghostBookshelf.Model.extend({
         ghostBookshelf.Model.prototype.emitChange.bind(this)(this, eventToTrigger, options);
     },
 
+    onFetched: async function onFetched(model, response, options) {
+        if (!labs.isSet('collectionsCard')) {
+            return;
+        }
+
+        await this.renderIfNeeded(model, options);
+    },
+
+    onFetchedCollection: async function onFetched(collection, response, options) {
+        if (!labs.isSet('collectionsCard')) {
+            return;
+        }
+
+        for await (const model of collection.models) {
+            await this.renderIfNeeded(model, options);
+        }
+    },
+
+    renderIfNeeded: async function renderIfNeeded(model, options = {}) {
+        // pages can have their html cleared to "queue" a re-render to update dynamic data such
+        // as collection cards. Detect that and re-render here so the page is always up to date
+        if (model.get('lexical') !== null && model.get('html') === null) {
+            const html = await lexicalLib.render(model.get('lexical'));
+            const plaintext = htmlToPlaintext.excerpt(html);
+
+            // set model attributes so they are available immediately in code that uses the returned model
+            model.set('html', html);
+            model.set('plaintext', plaintext);
+
+            // update database manually using knex to avoid hooks being called multiple times
+            const query = ghostBookshelf.knex.raw('UPDATE posts SET html = ?, plaintext = ? WHERE id = ?', [html, plaintext, model.id]);
+            if (options.transacting) {
+                await query.transacting(options.transacting);
+            } else {
+                await query;
+            }
+        }
+
+        return model;
+    },
+
     /**
      * We update the tags after the Post was inserted.
      * We update the tags before the Post was updated, see `onSaving` event.
@@ -464,9 +505,25 @@ Post = ghostBookshelf.Model.extend({
         }
     },
 
-    onDestroyed: function onDestroyed(model, options) {
+    onDestroyed: async function onDestroyed(model, options) {
         ghostBookshelf.Model.prototype.onDestroyed.apply(this, arguments);
 
+        if (labs.isSet('collectionsCard') && model.previous('type') === 'post' && model.previous('status') === 'published') {
+            // reset all page HTML when a published post is deleted so they can be re-rendered
+            // on next fetch so any collection cards are "dynamically" updated
+            const resetPages = function resetPages(transacting) {
+                return ghostBookshelf.knex.raw('UPDATE posts set html = NULL WHERE type = \'page\' AND lexical IS NOT NULL').transacting(transacting);
+            };
+
+            if (options.transacting) {
+                await resetPages(options.transacting);
+            } else {
+                await ghostBookshelf.knex.transaction(async (transacting) => {
+                    await resetPages(transacting);
+                });
+            }
+        }
+
         if (model.previous('status') === 'published') {
             model.emitChange('unpublished', Object.assign({usePreviousAttribute: true}, options));
         }
@@ -941,6 +998,19 @@ Post = ghostBookshelf.Model.extend({
             })));
         }
 
+        if (labs.isSet('collectionsCard') && this.get('type') === 'post' && (newStatus === 'published' || olderStatus === 'published')) {
+            // reset all page HTML when a published post is updated so they can be re-rendered
+            // on next fetch so any collection cards are "dynamically" updated
+            ops.push(async function resetPageHTML() {
+                const query = ghostBookshelf.knex.raw('UPDATE posts set html = NULL WHERE type = ? AND lexical IS NOT NULL', ['page']);
+                if (options.transacting) {
+                    await query.transacting(options.transacting);
+                } else {
+                    await query;
+                }
+            });
+        }
+
         return sequence(ops);
     },
 

package/core/server/models/relations/authors.js

@@ -71,7 +71,7 @@ module.exports.extendModel = function extendModel(Post, Posts, ghostBookshelf) {
                 model._originalOptions = collection._originalOptions;
             }));
 
-            return proto.onFetchingCollection.call(this, collection, attrs, options);
+            return proto.onFetchedCollection.call(this, collection, attrs, options);
         },
 
         onCreating: function onCreating(model, attrs, options) {

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

@@ -12,9 +12,12 @@ const {default: ObjectID} = require('bson-objectid');
 module.exports = class BookshelfCollectionsRepository {
     #model;
     #relationModel;
-    constructor(model, relationModel) {
+    /** @type {import('@tryghost/domain-events')} */
+    #DomainEvents;
+    constructor(model, relationModel, DomainEvents) {
         this.#model = model;
         this.#relationModel = relationModel;
+        this.#DomainEvents = DomainEvents;
     }
 
     async createTransaction(cb) {
@@ -201,46 +204,46 @@ module.exports = class BookshelfCollectionsRepository {
                 transacting: options.transaction
             });
 
-            const collectionPostsRelations = collection.posts.map((postId, index) => {
-                return {
-                    id: (new ObjectID).toHexString(),
-                    sort_order: collection.type === 'manual' ? index : 0,
-                    collection_id: collection.id,
-                    post_id: postId
-                };
-            });
-
-            const collectionPostRelationsToDeleteIds = [];
-
             if (collection.type === 'manual') {
+                const collectionPostsRelations = collection.posts.map((postId, index) => {
+                    return {
+                        id: (new ObjectID).toHexString(),
+                        sort_order: index,
+                        collection_id: collection.id,
+                        post_id: postId
+                    };
+                });
                 await this.#relationModel.query().delete().where('collection_id', collection.id).transacting(options.transaction);
-            } else {
-                const collectionPostsOptions = {
-                    transaction: options.transaction,
-                    columns: ['id', 'post_id']
-                };
-                const existingRelations = await this.#fetchCollectionPostIds(collection.id, collectionPostsOptions);
-
-                for (const existingRelation of existingRelations) {
-                    const found = collectionPostsRelations.find((thing) => {
-                        return thing.post_id === existingRelation.post_id;
-                    });
-                    if (found) {
-                        found.id = null;
-                    } else {
-                        collectionPostRelationsToDeleteIds.push(existingRelation.id);
-                    }
+                if (collectionPostsRelations.length > 0) {
+                    await this.#relationModel.query().insert(collectionPostsRelations).transacting(options.transaction);
                 }
-            }
+            } else {
+                const collectionPostsToDelete = collection.events.filter(event => event.type === 'CollectionPostRemoved').map((event) => {
+                    return event.data.post_id;
+                });
 
-            const missingCollectionPostsRelations = collectionPostsRelations.filter(thing => thing.id !== null);
+                const collectionPostsToInsert = collection.events.filter(event => event.type === 'CollectionPostAdded').map((event) => {
+                    return {
+                        id: (new ObjectID).toHexString(),
+                        sort_order: 0,
+                        collection_id: collection.id,
+                        post_id: event.data.post_id
+                    };
+                });
 
-            if (missingCollectionPostsRelations.length > 0) {
-                await this.#relationModel.query().insert(missingCollectionPostsRelations).transacting(options.transaction);
-            }
-            if (collectionPostRelationsToDeleteIds.length > 0) {
-                await this.#relationModel.query().delete().whereIn('id', collectionPostRelationsToDeleteIds).transacting(options.transaction);
+                if (collectionPostsToDelete.length > 0) {
+                    await this.#relationModel.query().delete().where('collection_id', collection.id).whereIn('post_id', collectionPostsToDelete).transacting(options.transaction);
+                }
+                if (collectionPostsToInsert.length > 0) {
+                    await this.#relationModel.query().insert(collectionPostsToInsert).transacting(options.transaction);
+                }
             }
+
+            options.transaction.executionPromise.then(() => {
+                for (const event of collection.events) {
+                    this.#DomainEvents.dispatch(event);
+                }
+            });
         }
     }
 };

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

@@ -4,6 +4,11 @@ class PostsRepository {
         this.moment = moment;
     }
 
+    async getAllIds() {
+        const rows = await this.models.Post.query().select('id').where('type', 'post');
+
+        return rows.map(row => row.id);
+    }
     async getAll({filter, transaction}) {
         const {data: models} = await this.models.Post.findPage({
             filter: `(${filter})+type:post`,

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

@@ -12,7 +12,7 @@ class CollectionsServiceWrapper {
         const DomainEvents = require('@tryghost/domain-events');
         const postsRepository = require('./PostsRepository').getInstance();
         const models = require('../../models');
-        const collectionsRepositoryInMemory = new BookshelfCollectionsRepository(models.Collection, models.CollectionPost);
+        const collectionsRepositoryInMemory = new BookshelfCollectionsRepository(models.Collection, models.CollectionPost, DomainEvents);
 
         const collectionsService = new CollectionsService({
             collectionsRepository: collectionsRepositoryInMemory,
@@ -34,8 +34,12 @@ class CollectionsServiceWrapper {
         const config = require('../../../shared/config');
         const labs = require('../../../shared/labs');
 
-        // host setting OR labs "collections" flag has to be enabled to run collections service
-        if (config.get('hostSettings:collections:enabled') || labs.isSet('collections')) {
+        // CASE: emergency kill switch in case we need to disable collections outside of labs
+        if (config.get('hostSettings:collections:enabled') === false) {
+            return;
+        }
+
+        if (labs.isSet('collections')) {
             if (inited) {
                 return;
             }

package/core/server/services/members/content-gating.js

@@ -8,12 +8,6 @@ const BLOCK_ACCESS = false;
 
 // TODO: better place to store this?
 const MEMBER_NQL_EXPANSIONS = [{
-    key: 'labels',
-    replacement: 'labels.slug'
-}, {
-    key: 'label',
-    replacement: 'labels.slug'
-}, {
     key: 'products',
     replacement: 'products.slug'
 }, {
@@ -21,6 +15,16 @@ const MEMBER_NQL_EXPANSIONS = [{
     replacement: 'products.slug'
 }];
 
+const rejectUnknownKeys = input => nql.utils.mapQuery(input, function (value, key) {
+    if (!['product', 'products', 'status'].includes(key.toLowerCase())) {
+        return;
+    }
+
+    return {
+        [key]: value
+    };
+});
+
 /**
  * @param {object} post - A post object to check access to
  * @param {object} member - The member whos access should be checked
@@ -50,7 +54,7 @@ function checkPostAccess(post, member) {
         }).join(',');
     }
 
-    if (visibility && member.status && nql(visibility, {expansions: MEMBER_NQL_EXPANSIONS}).queryJSON(member)) {
+    if (visibility && member.status && nql(visibility, {expansions: MEMBER_NQL_EXPANSIONS, transformer: rejectUnknownKeys}).queryJSON(member)) {
         return PERMIT_ACCESS;
     }
 

package/core/server/services/mentions/WebmentionMetadata.js

@@ -34,7 +34,13 @@ module.exports = class WebmentionMetadata {
      */
     async fetch(url) {
         const mappedUrl = this.#getMappedUrl(url);
-        const data = await oembedService.fetchOembedDataFromUrl(mappedUrl.href, 'mention');
+        const data = await oembedService.fetchOembedDataFromUrl(mappedUrl.href, 'mention', {
+            timeout: 15000,
+            retry: {
+                // Only retry on network issues, or specific HTTP status codes
+                limit: 3
+            }
+        });
 
         const result = {
             siteTitle: data.metadata.publisher,
@@ -50,7 +56,13 @@ module.exports = class WebmentionMetadata {
         if (mappedUrl.href !== url.href) {
             // Still need to fetch body and contentType separately now
             // For verification
-            const {body, contentType} = await oembedService.fetchPageHtml(url);
+            const {body, contentType} = await oembedService.fetchPageHtml(url, {
+                timeout: 15000,
+                retry: {
+                    // Only retry on network issues, or specific HTTP status codes
+                    limit: 3
+                }
+            });
             result.body = body;
             result.contentType = contentType;
         }

package/core/server/services/public-config/site.js

@@ -14,7 +14,7 @@ module.exports = function getSiteProperties() {
         locale: settingsCache.get('locale'),
         url: urlUtils.urlFor('home', true),
         version: ghostVersion.safe,
-        allow_self_signup: settingsCache.get('allow_self_signup')
+        allow_external_signup: settingsCache.get('allow_self_signup') && !(settingsCache.get('portal_signup_checkbox_required') && settingsCache.get('portal_signup_terms_html'))
     };
 
     if (config.get('client_sentry') && !config.get('client_sentry').disabled) {

package/core/server/services/recommendations/RecommendationServiceWrapper.js

@@ -45,7 +45,7 @@ class RecommendationServiceWrapper {
 
         const mentions = require('../mentions');
 
-        if (!mentions.sendingService) {
+        if (!mentions.sendingService || !mentions.api) {
             // eslint-disable-next-line ghost/ghost-custom/no-native-error
             throw new Error('MentionSendingService not intialized, but this is a dependency of RecommendationServiceWrapper. Check boot order.');
         }
@@ -75,7 +75,8 @@ class RecommendationServiceWrapper {
             wellknownService,
             mentionSendingService: mentions.sendingService,
             clickEventRepository: this.clickEventRepository,
-            subscribeEventRepository: this.subscribeEventRepository
+            subscribeEventRepository: this.subscribeEventRepository,
+            mentionsApi: mentions.api
         });
         this.controller = new RecommendationController({
             service: this.service

package/core/server/web/api/endpoints/admin/routes.js

@@ -46,7 +46,7 @@ module.exports = function apiRoutes() {
     router.del('/posts/:id', mw.authAdminApi, http(api.posts.destroy));
     router.post('/posts/:id/copy', mw.authAdminApi, http(api.posts.copy));
 
-    router.get('/mentions', labs.enabledMiddleware('webmentions'), mw.authAdminApi, http(api.mentions.browse));
+    router.get('/mentions', mw.authAdminApi, http(api.mentions.browse));
 
     router.put('/comments/:id', mw.authAdminApi, http(api.comments.edit));
 
@@ -349,6 +349,7 @@ module.exports = function apiRoutes() {
 
     // Recommendations
     router.get('/recommendations', mw.authAdminApi, http(api.recommendations.browse));
+    router.get('/recommendations/:id', mw.authAdminApi, http(api.recommendations.read));
     router.post('/recommendations', mw.authAdminApi, http(api.recommendations.add));
     router.put('/recommendations/:id', mw.authAdminApi, http(api.recommendations.edit));
     router.del('/recommendations/:id', mw.authAdminApi, http(api.recommendations.destroy));

package/core/shared/config/defaults.json

@@ -201,10 +201,6 @@
         "url": "https://cdn.jsdelivr.net/ghost/koenig-lexical@~{version}/dist/koenig-lexical.umd.js",
         "version": "0.4"
     },
-    "adminX": {
-        "url": "https://cdn.jsdelivr.net/ghost/admin-x-settings@~{version}/dist/admin-x-settings.js",
-        "version": "0.0"
-    },
     "signupForm": {
         "url": "https://cdn.jsdelivr.net/ghost/signup-form@~{version}/umd/signup-form.min.js",
         "version": "0.1"

package/core/shared/labs.js

@@ -15,6 +15,7 @@ const messages = {
 // flags in this list always return `true`, allows quick global enable prior to full flag removal
 const GA_FEATURES = [
     'audienceFeedback',
+    'collections',
     'themeErrorsNotification',
     'outboundLinkTagging',
     'announcementBar',
@@ -36,7 +37,6 @@ const ALPHA_FEATURES = [
     'websockets',
     'stripeAutomaticTax',
     'emailCustomization',
-    'collections',
     'adminXSettings',
     'mailEvents',
     'collectionsCard',