ghost 5.50.3 → 5.51.0

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

@@ -4,6 +4,9 @@ const site = {
     docName: 'site',
 
     read: {
+        headers: {
+            cacheInvalidate: false
+        },
         permissions: false,
         query() {
             return publicConfig.site;

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

@@ -4,6 +4,9 @@ const events = require('../../lib/common/events');
 module.exports = {
     docName: 'slack',
     sendTest: {
+        headers: {
+            cacheInvalidate: false
+        },
         permissions: false,
         query() {
             events.emit('slack.test');

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

@@ -12,6 +12,9 @@ module.exports = {
     docName: 'snippets',
 
     browse: {
+        headers: {
+            cacheInvalidate: false
+        },
         options: [
             'limit',
             'order',
@@ -33,7 +36,9 @@ module.exports = {
     },
 
     read: {
-        headers: {},
+        headers: {
+            cacheInvalidate: false
+        },
         options: [
             'formats'
         ],
@@ -57,7 +62,9 @@ module.exports = {
 
     add: {
         statusCode: 201,
-        headers: {},
+        headers: {
+            cacheInvalidate: false
+        },
         options: [
             'formats'
         ],
@@ -75,7 +82,9 @@ module.exports = {
     },
 
     edit: {
-        headers: {},
+        headers: {
+            cacheInvalidate: false
+        },
         options: [
             'id',
             'formats'
@@ -104,7 +113,9 @@ module.exports = {
 
     destroy: {
         statusCode: 204,
-        headers: {},
+        headers: {
+            cacheInvalidate: false
+        },
         options: [
             'id'
         ],

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

@@ -3,6 +3,9 @@ const statsService = require('../../services/stats');
 module.exports = {
     docName: 'stats',
     memberCountHistory: {
+        headers: {
+            cacheInvalidate: false
+        },
         permissions: {
             docName: 'members',
             method: 'browse'
@@ -12,6 +15,9 @@ module.exports = {
         }
     },
     mrr: {
+        headers: {
+            cacheInvalidate: false
+        },
         permissions: {
             docName: 'members',
             method: 'browse'
@@ -21,6 +27,9 @@ module.exports = {
         }
     },
     subscriptions: {
+        headers: {
+            cacheInvalidate: false
+        },
         permissions: {
             docName: 'members',
             method: 'browse'
@@ -30,6 +39,9 @@ module.exports = {
         }
     },
     postReferrers: {
+        headers: {
+            cacheInvalidate: false
+        },
         data: [
             'id'
         ],
@@ -42,6 +54,9 @@ module.exports = {
         }
     },
     referrersHistory: {
+        headers: {
+            cacheInvalidate: false
+        },
         data: [
             'id'
         ],

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

@@ -14,6 +14,9 @@ module.exports = {
     docName: 'tags',
 
     browse: {
+        headers: {
+            cacheInvalidate: false
+        },
         cache: tagsPublicService.api?.cache,
         options: [
             'include',
@@ -38,6 +41,9 @@ module.exports = {
     },
 
     read: {
+        headers: {
+            cacheInvalidate: false
+        },
         options: [
             'include',
             'filter',

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

@@ -13,6 +13,9 @@ module.exports = {
     docName: 'tags',
 
     browse: {
+        headers: {
+            cacheInvalidate: false
+        },
         options: [
             'include',
             'filter',
@@ -36,6 +39,9 @@ module.exports = {
     },
 
     read: {
+        headers: {
+            cacheInvalidate: false
+        },
         options: [
             'include',
             'filter',
@@ -91,7 +97,9 @@ module.exports = {
     },
 
     edit: {
-        headers: {},
+        headers: {
+            cacheInvalidate: false
+        },
         options: [
             'id',
             'include'

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

@@ -10,6 +10,9 @@ module.exports = {
     docName: 'themes',
 
     browse: {
+        headers: {
+            cacheInvalidate: false
+        },
         permissions: true,
         query() {
             return themeService.api.getJSON();
@@ -17,6 +20,9 @@ module.exports = {
     },
 
     readActive: {
+        headers: {
+            cacheInvalidate: false
+        },
         permissions: true,
         async query() {
             let themeName = settingsCache.get('active_theme');
@@ -59,7 +65,9 @@ module.exports = {
     },
 
     install: {
-        headers: {},
+        headers: {
+            cacheInvalidate: false
+        },
         options: [
             'source',
             'ref'
@@ -94,7 +102,9 @@ module.exports = {
     },
 
     upload: {
-        headers: {},
+        headers: {
+            cacheInvalidate: false
+        },
         permissions: {
             method: 'add'
         },
@@ -125,6 +135,9 @@ module.exports = {
     },
 
     download: {
+        headers: {
+            cacheInvalidate: false
+        },
         options: [
             'name'
         ],

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

@@ -4,6 +4,9 @@ module.exports = {
     docName: 'tiers',
 
     browse: {
+        headers: {
+            cacheInvalidate: false
+        },
         options: [
             'limit',
             'fields',

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

@@ -4,6 +4,9 @@ module.exports = {
     docName: 'tiers',
 
     browse: {
+        headers: {
+            cacheInvalidate: false
+        },
         options: [
             'limit',
             'fields',
@@ -22,6 +25,9 @@ module.exports = {
     },
 
     read: {
+        headers: {
+            cacheInvalidate: false
+        },
         data: [
             'id'
         ],

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

@@ -45,6 +45,9 @@ module.exports = {
     docName: 'users',
 
     browse: {
+        headers: {
+            cacheInvalidate: false
+        },
         options: [
             'include',
             'filter',
@@ -68,6 +71,9 @@ module.exports = {
     },
 
     read: {
+        headers: {
+            cacheInvalidate: false
+        },
         options: [
             'include',
             'filter',
@@ -103,7 +109,9 @@ module.exports = {
     },
 
     edit: {
-        headers: {},
+        headers: {
+            cacheInvalidate: false
+        },
         options: [
             'id',
             'include'
@@ -166,6 +174,9 @@ module.exports = {
     },
 
     changePassword: {
+        headers: {
+            cacheInvalidate: false
+        },
         validation: {
             docName: 'password',
             data: {
@@ -188,6 +199,9 @@ module.exports = {
     },
 
     transferOwnership: {
+        headers: {
+            cacheInvalidate: false
+        },
         permissions(frame) {
             return models.Role.findOne({name: 'Owner'})
                 .then((ownerRole) => {
@@ -200,6 +214,9 @@ module.exports = {
     },
 
     readToken: {
+        headers: {
+            cacheInvalidate: false
+        },
         options: [
             'id'
         ],
@@ -218,6 +235,9 @@ module.exports = {
     },
 
     regenerateToken: {
+        headers: {
+            cacheInvalidate: false
+        },
         options: [
             'id'
         ],

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

@@ -24,7 +24,19 @@ const labs = require('../../../../../../../shared/labs');
 module.exports = async (model, frame, options = {}) => {
     const {tiers: tiersData} = options || {};
 
-    const jsonModel = model.toJSON(frame.options);
+    // NOTE: `model` is now overloaded and may be a bookshelf model or a POJO
+    let jsonModel = model;
+    if (typeof model.toJSON === 'function') {
+        jsonModel = model.toJSON(frame.options);
+    } else {
+        // This is to satisy the interface which extraAttrs needs
+        model = {
+            id: jsonModel.id,
+            get(attr) {
+                return jsonModel[attr];
+            }
+        };
+    }
 
     // Map email_recipient_filter to email_segment
     jsonModel.email_segment = jsonModel.email_recipient_filter;

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

@@ -33,7 +33,7 @@ function serializeSettings(models, apiConfig, frame) {
     // If this is public, we already have the right data, we just need to add an Array wrapper
     if (utils.isContentAPI(frame)) {
         filteredSettings = models;
-        
+
         // Change the returned icon location to use a resized version, to prevent serving giant icon files
         const icon = filteredSettings.icon;
         if (icon) {

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

@@ -22,7 +22,8 @@ module.exports = {
         statusCode: 201,
         headers: {
             // NOTE: remove if there is ever a 'read' method
-            location: false
+            location: false,
+            cacheInvalidate: false
         },
         options: [],
         data: [],
@@ -33,6 +34,9 @@ module.exports = {
     },
 
     edit: {
+        headers: {
+            cacheInvalidate: false
+        },
         permissions: {
             before: (frame) => {
                 if (frame.options.context && frame.options.context.integration && frame.options.context.integration.id) {
@@ -84,7 +88,9 @@ module.exports = {
 
     destroy: {
         statusCode: 204,
-        headers: {},
+        headers: {
+            cacheInvalidate: false
+        },
         options: [
             'id'
         ],

package/core/server/data/migrations/versions/5.51/2023-05-30-19-03-update-pintura-setting.js

@@ -0,0 +1,19 @@
+const logging = require('@tryghost/logging');
+const {createTransactionalMigration} = require('../../utils');
+
+module.exports = createTransactionalMigration(
+    async function up(knex) {
+        logging.info('Updating setting: "pintura" to "true"');
+        await knex('settings')
+            .where({
+                key: 'pintura'
+            })
+            .update({
+                value: 'true'
+            });
+    },
+
+    async function down() {
+        // no-op: this is a one way migration to set the default value for pintura integration
+    }
+);

package/core/server/data/migrations/versions/5.51/2023-06-07-10-17-add-collections-crud-persmissions.js

@@ -0,0 +1,54 @@
+const {combineTransactionalMigrations, addPermissionWithRoles} = require('../../utils');
+
+module.exports = combineTransactionalMigrations(
+    addPermissionWithRoles({
+        name: 'Browse collections',
+        action: 'browse',
+        object: 'collection'
+    }, [
+        'Administrator',
+        'Admin Integration',
+        'Editor',
+        'Author',
+        'Contributor'
+    ]),
+    addPermissionWithRoles({
+        name: 'Read collections',
+        action: 'read',
+        object: 'collection'
+    }, [
+        'Administrator',
+        'Admin Integration',
+        'Editor',
+        'Author',
+        'Contributor'
+    ]),
+    addPermissionWithRoles({
+        name: 'Edit collections',
+        action: 'edit',
+        object: 'collection'
+    }, [
+        'Administrator',
+        'Admin Integration',
+        'Editor'
+    ]),
+    addPermissionWithRoles({
+        name: 'Add collections',
+        action: 'add',
+        object: 'collection'
+    }, [
+        'Administrator',
+        'Admin Integration',
+        'Editor',
+        'Author'
+    ]),
+    addPermissionWithRoles({
+        name: 'Delete collections',
+        action: 'destroy',
+        object: 'collection'
+    }, [
+        'Administrator',
+        'Admin Integration',
+        'Editor'
+    ])
+);

package/core/server/data/schema/default-settings/default-settings.json

@@ -530,7 +530,7 @@
     },
     "pintura": {
         "pintura": {
-            "defaultValue": "false",
+            "defaultValue": "true",
             "validations": {
                 "isIn": [
                     [

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

@@ -69,6 +69,7 @@ class FixtureManager {
      */
     async addAllFixtures(options) {
         const localOptions = _.merge({
+            autoRefresh: false,
             context: {internal: true},
             migrating: true
         }, options);

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

@@ -642,6 +642,31 @@
                     "name": "Browse mentions",
                     "action_type": "browse",
                     "object_type": "mention"
+                },
+                {
+                    "name": "Browse collections",
+                    "action_type": "browse",
+                    "object_type": "collection"
+                },
+                {
+                    "name": "Read collections",
+                    "action_type": "read",
+                    "object_type": "collection"
+                },
+                {
+                    "name": "Edit collections",
+                    "action_type": "edit",
+                    "object_type": "collection"
+                },
+                {
+                    "name": "Add collections",
+                    "action_type": "add",
+                    "object_type": "collection"
+                },
+                {
+                    "name": "Delete collections",
+                    "action_type": "destroy",
+                    "object_type": "collection"
                 }
             ]
         },
@@ -785,7 +810,8 @@
                     "explore": "read",
                     "comment": "all",
                     "link": "all",
-                    "mention": "browse"
+                    "mention": "browse",
+                    "collection": "all"
                 },
                 "DB Backup Integration": {
                     "db": "all"
@@ -826,7 +852,8 @@
                     "explore": "read",
                     "comment": "all",
                     "link": "all",
-                    "mention": "browse"
+                    "mention": "browse",
+                    "collection": "all"
                 },
                 "Editor": {
                     "notification": "all",
@@ -843,7 +870,8 @@
                     "snippet": "all",
                     "label": ["browse", "read"],
                     "product": ["browse", "read"],
-                    "newsletter": ["browse", "read"]
+                    "newsletter": ["browse", "read"],
+                    "collection": "all"
                 },
                 "Author": {
                     "post": ["browse", "read", "add"],
@@ -858,7 +886,8 @@
                     "snippet": ["browse", "read"],
                     "label": ["browse", "read"],
                     "product": ["browse", "read"],
-                    "newsletter": ["browse", "read"]
+                    "newsletter": ["browse", "read"],
+                    "collection": ["browse", "read", "add"]
                 },
                 "Contributor": {
                     "post": ["browse", "read", "add"],
@@ -870,7 +899,8 @@
                     "theme": ["browse"],
                     "email_preview": "read",
                     "email": "read",
-                    "snippet": ["browse", "read"]
+                    "snippet": ["browse", "read"],
+                    "collection": ["browse", "read"]
                 }
             }
         },

package/core/server/services/collections/built-in-collections.js

@@ -0,0 +1,8 @@
+module.exports = [{
+    title: 'Featured Posts',
+    slug: 'featured',
+    description: 'Collection of featured posts',
+    type: 'automatic',
+    deletable: false,
+    filter: 'featured:true'
+}];

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

@@ -4,24 +4,48 @@ const {
 } = require('@tryghost/collections');
 
 class CollectionsServiceWrapper {
+    /** @type {CollectionsService} */
     api;
 
     constructor() {
+        const models = require('../../models');
+        const events = require('../../lib/common/events');
         const collectionsRepositoryInMemory = new CollectionsRepositoryInMemory();
 
         const collectionsService = new CollectionsService({
-            collectionsRepository: collectionsRepositoryInMemory
+            collectionsRepository: collectionsRepositoryInMemory,
+            postsRepository: {
+                getAll: async ({filter}) => {
+                    return models.Post.findAll({
+                        // @NOTE: enforce "post" type to avoid ever fetching pages
+                        filter: `(${filter})+type:post`
+                    });
+                }
+            }
         });
 
-        this.api = {
-            browse: collectionsService.getAll.bind(collectionsService),
-            read: collectionsService.getById.bind(collectionsService),
-            add: collectionsService.createCollection.bind(collectionsService),
-            edit: collectionsService.edit.bind(collectionsService),
-            addPost: collectionsService.addPostToCollection.bind(collectionsService),
-            destroy: collectionsService.destroy.bind(collectionsService),
-            destroyCollectionPost: collectionsService.removePostFromCollection.bind(collectionsService)
-        };
+        // @NOTE: these should be reworked to use the "Event" classes
+        //        instead of Bookshelf model events
+        const updateEvents = require('./update-events');
+
+        // @NOTE: naive update implementation to keep things simple for the first version
+        for (const event of updateEvents) {
+            events.on(event, () => {
+                collectionsService.updateAutomaticCollections();
+            });
+        }
+
+        this.api = collectionsService;
+    }
+
+    async init() {
+        const featuredCollections = await this.api.getAll({filter: 'slug:featured'});
+
+        if (!featuredCollections.data.length) {
+            require('./built-in-collections').forEach((collection) => {
+                this.api.createCollection(collection);
+            });
+        }
     }
 }
 

package/core/server/services/collections/update-events.js

@@ -0,0 +1,15 @@
+module.exports = [
+    'post.published',
+    'post.published.edited',
+    'post.unpublished',
+    'tag.added',
+    'tag.edited',
+    'tag.attached',
+    'tag.detached',
+    'tag.deleted',
+    'user.activated',
+    'user.activated.edited',
+    'user.attached',
+    'user.detached',
+    'user.deleted'
+];

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

@@ -12,6 +12,7 @@ const getPostServiceInstance = () => {
     const emailService = require('../email-service');
     const settingsCache = require('../../../shared/settings-cache');
     const settingsHelpers = require('../settings-helpers');
+    const collectionsService = require('../collections');
 
     const postStats = new PostStats();
 
@@ -37,7 +38,8 @@ const getPostServiceInstance = () => {
         isSet: flag => labs.isSet(flag), // don't use bind, that breaks test subbing of labs
         stats: postStats,
         emailService: emailService.service,
-        postsExporter
+        postsExporter,
+        collectionsService: collectionsService.api
     });
 };