ghost 5.49.2 → 5.50.0

package/core/built/admin/assets/{vendor-e0851d527586cb85e37e146ec921136a.js → vendor-bc3bd83c56b822ae56193b0d231189c0.js}

@@ -11712,7 +11712,7 @@ e.default={content:'<g fill="none" fill-rule="evenodd"><path d="M31.252 8.488a4.
 Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
 e.default={content:'<path opacity=".4" d="M2 5h12a1 1 0 011 1v4a1 1 0 01-1 1H2a1 1 0 01-1-1V6a1 1 0 011-1z" fill="#394047"/><path fill-rule="evenodd" clip-rule="evenodd" d="M15 13.25a.75.75 0 01-.75.75H1.75a.75.75 0 010-1.5h12.5a.75.75 0 01.75.75zm0-10.5a.75.75 0 01-.75.75H1.75a.75.75 0 010-1.5h12.5a.75.75 0 01.75.75z" fill="#394047"/>',attrs:{fill:"none",viewBox:"0 0 16 16"}}})),define("ember-svg-jar/inlined/koenig/kg-edit",["exports"],(function(e){"use strict"
 Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
-e.default={content:'<path d="M9.66 3.944c-.132-.125-.264-.125-.396 0L3.626 9.638c-.132.132-.132.264 0 .396l2.397 2.397c.132.132.264.132.396 0l5.638-5.693c.132-.132.132-.264 0-.396L9.66 3.944zm-6.98 6.974c-.074-.074-.162-.098-.263-.074a.262.262 0 00-.2.186l-1.2 3.595a.264.264 0 00.068.287c.082.08.178.103.287.067l3.595-1.198a.261.261 0 00.186-.2.263.263 0 00-.074-.264l-2.399-2.4zM13.862 2.13c-.931-.889-1.862-.889-2.793 0l-.399.399c-.132.132-.132.264 0 .396l2.396 2.397c.132.131.264.131.396 0l.4-.402c.927-.93.927-1.86 0-2.79z" fill="#FFF" fill-rule="evenodd"/>',attrs:{viewBox:"0 0 16 16"}}})),define("ember-svg-jar/inlined/koenig/kg-header-full-center",["exports"],(function(e){"use strict"
+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-header-full-center",["exports"],(function(e){"use strict"
 Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
 e.default={content:'<path fill="#fff" d="M0 0h75v50H0z"/><path fill="#F1F1F1" d="M0 12h75v25H0z"/><rect x="21" y="19" width="32" height="10" rx="2" fill="#fff"/><rect x="21" y="6" width="32" height="1.5" rx=".75" fill="#F1F1F1"/><rect x="21" y="42" width="32" height="1.5" rx=".75" fill="#F1F1F1"/>',attrs:{viewBox:"0 0 75 50",fill:"none"}}})),define("ember-svg-jar/inlined/koenig/kg-header-full-left",["exports"],(function(e){"use strict"
 Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
@@ -14093,4 +14093,4 @@ return void 0===n&&(n=(0,t.createStorage)(null,(()=>!1)),r.set(e,n)),n}dirtyStor
 r&&(0,t.setValue)(r,null)}constructor(e){o(this,"storages",new WeakMap),o(this,"vals",void 0),this.vals=new WeakSet(e)}has(e){return(0,t.getValue)(this.storageFor(e)),this.vals.has(e)}add(e){return this.vals.add(e),this.dirtyStorageFor(e),this}delete(e){return this.dirtyStorageFor(e),this.vals.delete(e)}get[i](){return this.vals[Symbol.toStringTag]}}e.TrackedWeakSet=s,Object.setPrototypeOf(s.prototype,WeakSet.prototype)})),define("tracked-built-ins/index",["exports","tracked-built-ins/-private/decorator","tracked-built-ins/-private/array","tracked-built-ins/-private/object","tracked-built-ins/-private/map","tracked-built-ins/-private/set"],(function(e,t,r,n,i,o){"use strict"
 Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"TrackedArray",{enumerable:!0,get:function(){return r.default}}),Object.defineProperty(e,"TrackedMap",{enumerable:!0,get:function(){return i.TrackedMap}}),Object.defineProperty(e,"TrackedObject",{enumerable:!0,get:function(){return n.default}}),Object.defineProperty(e,"TrackedSet",{enumerable:!0,get:function(){return o.TrackedSet}}),Object.defineProperty(e,"TrackedWeakMap",{enumerable:!0,get:function(){return i.TrackedWeakMap}}),Object.defineProperty(e,"TrackedWeakSet",{enumerable:!0,get:function(){return o.TrackedWeakSet}}),Object.defineProperty(e,"tracked",{enumerable:!0,get:function(){return t.default}})}))
 
-//# sourceMappingURL=vendor-e0851d527586cb85e37e146ec921136a.map
+//# sourceMappingURL=vendor-bc3bd83c56b822ae56193b0d231189c0.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%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.49%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%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.50%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-e5dfcf346304a62879b8aa8380b500c7.css" title="light">
+    <link integrity="" rel="stylesheet" href="assets/ghost-51b822dbd104c8bcb90da467b093a741.css" title="light">
 
     
 </head>
@@ -56,9 +56,9 @@
 
     <div id="ember-basic-dropdown-wormhole"></div>
 
-    <script src="assets/vendor-e0851d527586cb85e37e146ec921136a.js"></script>
-<script src="assets/chunk.124.ede028f827ba942bf7e3.js"></script>
-<script src="assets/chunk.143.1d467437aed60c459bbb.js"></script>
-    <script src="assets/ghost-9169ef48d0474b34a0a2a01edd29683b.js"></script>
+    <script src="assets/vendor-bc3bd83c56b822ae56193b0d231189c0.js"></script>
+<script src="assets/chunk.976.cd1384578d700f188531.js"></script>
+<script src="assets/chunk.143.d620849d367a8ef5e12c.js"></script>
+    <script src="assets/ghost-d2778bbeddb60475038da075bab0a650.js"></script>
 </body>
 </html>

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

@@ -26,6 +26,7 @@
 .kg-product-card-image {
     grid-column: 1 / 3;
     justify-self: center;
+    height: auto;
 }
 
 .kg-product-card-title-container {

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

@@ -61,12 +61,12 @@
 /* Split layout image */
 
 .kg-signup-card-image {
-    object-fit: cover;
-    object-position: center;
     /* this will force the image to follow the signup card height */
     height: 0;
     min-height: 100%;
     /**/
+    object-fit: cover;
+    object-position: center;
 }
 
 .kg-signup-card-image.kg-style-accent {
@@ -76,11 +76,11 @@
 /* Heading */
 
 .kg-signup-card h2.kg-signup-card-heading {
+    margin: 0;
     font-size: 4.8vmin;
     font-weight: 700;
     line-height: 1em;
     letter-spacing: -0.01em;
-    margin: 0;
 }
 
 .kg-signup-card h2.kg-signup-card-heading strong {
@@ -88,11 +88,11 @@
 }
 
 .kg-signup-card.kg-width-wide h2.kg-signup-card-heading {
-    font-size: 6vmin;
+    font-size: 5.6vmin;
 }
 
 .kg-signup-card.kg-width-full h2.kg-signup-card-heading {
-    font-size: 8vmin;
+    font-size: 7.4vmin;
 }
 
 .kg-signup-card.kg-width-full.kg-layout-split h2.kg-signup-card-heading {
@@ -106,11 +106,11 @@
 }
 
 .kg-signup-card h3.kg-signup-card-subheading {
+    max-width: 40em;
+    margin: 0;
     font-size: 1.25em;
     font-weight: 500;
     line-height: 1.4em;
-    margin: 0;
-    max-width: 40em;
 }
 
 .kg-signup-card h2 + h3.kg-signup-card-subheading {
@@ -125,7 +125,8 @@
     font-size: 1.5em;
 }
 
-.kg-signup-card.kg-width-full h3.kg-signup-card-subheading {
+.kg-signup-card.kg-width-full h3.kg-signup-card-subheading:not(.kg-layout-split h3.kg-signup-card-subheading) {
+    max-width: 65vmax;
     font-size: 1.75em;
 }
 
@@ -137,9 +138,15 @@
 
 .kg-signup-card-form {
     position: relative;
+    display: flex;
+    flex-shrink: 0;
     width: 100%;
 }
 
+.align-center .kg-signup-card-form {
+    justify-content: center;
+}
+
 .kg-signup-card-heading + .kg-signup-card-form,
 .kg-signup-card-subheading + .kg-signup-card-form {
     margin: 2.4vmax 0 0;
@@ -157,34 +164,41 @@
 
 .kg-signup-card-fields {
     display: flex;
+    width: 100%;
+    padding: 3px;
+    background: #FFFFFF;
+    border: 1px solid #E6E6E6;
+    border-radius: 4px;
 }
 
-.align-center .kg-signup-card-fields {
-    justify-content: center;
+.kg-width-wide .kg-signup-card-fields,
+.kg-width-full .kg-signup-card-fields:not(.kg-layout-split .kg-signup-card-fields) {
+    width: 100%;
+    max-width: 500px;
 }
 
 .kg-signup-card-input {
     width: 100%;
-    border: solid 1px;
+    height: 4.6rem;
+    margin-right: 3px;
     padding: 12px 16px;
+    border: none;
     font-size: 1.1em;
 }
 
-.kg-width-wide .kg-signup-card-input,
-.kg-width-full .kg-signup-card-input:not(.kg-layout-split .kg-signup-card-input) {
-    max-width: 400px;
-}
-
-.kg-signup-card-input.kg-style-accent {
-    border-color: var(--ghost-accent-color);
+.kg-signup-card-input:focus,
+.kg-signup-card-input:focus-visible {
+    outline: none;
 }
 
 .kg-signup-card-button {
     display: flex;
     position: relative;
     align-items: center;
+    height: 4.6rem;
+    padding: 0 1.2em;
     outline: none;
-    font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
+    border: none;
     font-size: 1em;
     font-weight: 600;
     line-height: 1em;
@@ -193,8 +207,7 @@
     letter-spacing: .2px;
     white-space: nowrap;
     text-overflow: ellipsis;
-    height: 3em;
-    padding: 0 1.2em;
+    border-radius: 3px;
     transition: opacity .2s ease;
 }
 
@@ -249,10 +262,16 @@
     line-height: 1.4em;
 }
 
+.kg-signup-card-form.error .kg-signup-card-fields {
+    border: 1px solid #FF0000;
+    box-shadow: inset 0 0 0 1px rgba(255, 0, 0, 0.2);
+}
+
 .kg-signup-card-form.error .kg-signup-card-error {
-    display: block;
     position: absolute;
-    top: -32px;
+    bottom: calc(-1rem - 1.6em);
+    display: block;
+    font-size: inherit;
 }
 
 .kg-signup-card-button-loading {
@@ -263,6 +282,10 @@
     display: none;
 }
 
+.kg-signup-card-form.loading .kg-signup-card-button-default {
+    color: transparent;
+}
+
 .kg-signup-card-form.loading .kg-signup-card-button-loading {
     display: flex;
 }
@@ -273,7 +296,8 @@
     margin: 1rem 0 0;
 }
 
-.kg-signup-card-form.success + .kg-signup-card-disclaimer {
+.kg-signup-card-form.success + .kg-signup-card-disclaimer,
+.kg-signup-card-form.error + .kg-signup-card-disclaimer {
     visibility: hidden;
 }
 
@@ -300,8 +324,15 @@
     }
 
     .kg-signup-card-input {
-        font-size: inherit;
+        height: 4.2rem;
+        padding: 6px 12px;
+        font-size: 1em;
+    }
+
+    .kg-signup-card-button {
+        height: 4.2rem;
     }
+
     .kg-signup-card.kg-width-wide .kg-signup-card-button,
     .kg-signup-card.kg-width-full .kg-signup-card-button {
         font-size: 1em;
@@ -309,8 +340,8 @@
 
     .kg-signup-card h3.kg-signup-card-subheading,
     .kg-signup-card.kg-width-wide h3.kg-signup-card-subheading,
-    .kg-signup-card.kg-width-full h3.kg-signup-card-subheading,
-    .kg-signup-card.kg-width-full.kg-layout-split h3.kg-signup-card-subheading {
-        font-size: 1.1em;
+    .kg-signup-card.kg-width-full.kg-layout-split h3.kg-signup-card-subheading,
+    .kg-signup-card.kg-width-full h3.kg-signup-card-subheading:not(.kg-layout-split h3.kg-signup-card-subheading) {
+        font-size: 1em;
     }
-}
+}

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

@@ -91,6 +91,45 @@ module.exports = {
         }
     },
 
+    addPost: {
+        docName: 'collection_posts',
+        statusCode: 200,
+        headers: {},
+        options: [
+            'id'
+        ],
+        data: [
+            'post_id'
+        ],
+        validation: {
+            options: {
+                id: {
+                    required: true
+                }
+            },
+            data: {
+                post_id: {
+                    required: true
+                }
+            }
+        },
+        // @NOTE: should have permissions when moving out of Alpha
+        permissions: false,
+        async query(frame) {
+            const collectionPost = await collectionsService.api.addPost(frame.options.id, {
+                id: frame.data.posts[0].id
+            });
+
+            if (!collectionPost) {
+                throw new errors.NotFoundError({
+                    message: tpl(messages.collectionNotFound)
+                });
+            }
+
+            return collectionPost;
+        }
+    },
+
     destroy: {
         statusCode: 204,
         headers: {
@@ -111,5 +150,40 @@ module.exports = {
         async query(frame) {
             return await collectionsService.api.destroy(frame.options.id);
         }
+    },
+
+    destroyPost: {
+        docName: 'collection_posts',
+        statusCode: 200,
+        headers: {
+            cacheInvalidate: true
+        },
+        options: [
+            'id',
+            'post_id'
+        ],
+        validation: {
+            options: {
+                id: {
+                    required: true
+                },
+                post_id: {
+                    required: true
+                }
+            }
+        },
+        // @NOTE: should have permissions when moving out of Alpha
+        permissions: false,
+        async query(frame) {
+            const collection = await collectionsService.api.destroyCollectionPost(frame.options.id, frame.options.post_id);
+
+            if (!collection) {
+                throw new errors.NotFoundError({
+                    message: tpl(messages.collectionNotFound)
+                });
+            }
+
+            return collection;
+        }
     }
 };

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

@@ -1,22 +1,41 @@
 /**
  *
- * @param {import('@tryghost/collections').Collection} collection
+ * @param {import('@tryghost/collections').Collection | object} collection
  *
  * @returns {SerializedCollection}
  */
 const mapper = (collection) => {
-    const json = collection.toJSON();
+    let json;
+    let posts;
+    if (collection.toJSON) {
+        json = collection.toJSON();
+        posts = json.posts.map((postId, index) => {
+            return {
+                id: postId,
+                sort_order: index
+            };
+        });
+    } else {
+        json = collection;
+        posts = json.posts.map((post) => {
+            return {
+                id: post.id,
+                sort_order: post.sort_order
+            };
+        });
+    }
 
     const serialized = {
         id: json.id,
-        title: json.title,
+        title: json.title || null,
         slug: json.slug,
-        description: json.description,
+        description: json.description || null,
         type: json.type,
         filter: json.filter,
-        feature_image: json.featureImage,
-        created_at: json.createdAt.toISOString().replace(/\d{3}Z$/, '000Z'),
-        updated_at: json.updatedAt.toISOString().replace(/\d{3}Z$/, '000Z')
+        feature_image: json.feature_image || json.featureImage || null,
+        created_at: (json.created_at || json.createdAt).toISOString().replace(/\d{3}Z$/, '000Z'),
+        updated_at: (json.updated_at || json.updatedAt).toISOString().replace(/\d{3}Z$/, '000Z'),
+        posts
     };
 
     return serialized;

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

@@ -1,5 +1,3 @@
-const labs = require('../../../../../../../shared/labs');
-const config = require('../../../../../../../shared/config');
 const emailService = require('../../../../../../services/email-service');
 
 module.exports = (model, frame) => {
@@ -19,12 +17,6 @@ module.exports = (model, frame) => {
         }
     }
 
-    if (!labs.isSet('emailErrors') && !!(config.get('bulkEmail') && config.get('bulkEmail').mailgun)) {
-        if (jsonModel.status === 'failed') {
-            jsonModel.status = 'submitted';
-        }
-    }
-
     // Removed loaded post relation if set
     delete jsonModel.post;
 

package/core/server/models/post.js

@@ -20,7 +20,6 @@ const {Tag} = require('./tag');
 const {Newsletter} = require('./newsletter');
 const {BadRequestError} = require('@tryghost/errors');
 const {PostRevisions} = require('@tryghost/post-revisions');
-const labs = require('../../shared/labs');
 
 const messages = {
     isAlreadyPublished: 'Your post is already published, please reload your page.',
@@ -869,80 +868,45 @@ Post = ghostBookshelf.Model.extend({
                     });
             });
         }
+        if (!model.get('mobiledoc') && !options.importing && !options.migrating) {
+            const postRevisions = new PostRevisions({
+                config: {
+                    max_revisions: POST_REVISIONS_COUNT,
+                    revision_interval_ms: POST_REVISIONS_INTERVAL_MS
+                }
+            });
+            const authorId = this.contextUser(options);
+            ops.push(async function updateRevisions() {
+                const revisionModels = await ghostBookshelf.model('PostRevision')
+                    .findAll(Object.assign({
+                        filter: `post_id:${model.id}`,
+                        columns: ['id', 'lexical', 'created_at', 'author_id', 'title', 'reason', 'post_status', 'created_at_ts', 'feature_image']
+                    }, _.pick(options, 'transacting')));
+
+                const revisions = revisionModels.toJSON();
+
+                const current = {
+                    id: model.id,
+                    lexical: model.get('lexical'),
+                    html: model.get('html'),
+                    author_id: authorId,
+                    feature_image: model.get('feature_image'),
+                    feature_image_alt: model.get('posts_meta')?.feature_image_alt,
+                    feature_image_caption: model.get('posts_meta')?.feature_image_caption,
+                    title: model.get('title'),
+                    post_status: model.get('status')
+                };
 
-        if (!labs.isSet('postHistory')) {
-            if (model.hasChanged('lexical') && !model.get('mobiledoc') && !options.importing && !options.migrating) {
-                ops.push(function updateRevisions() {
-                    return ghostBookshelf.model('PostRevision')
-                        .findAll(Object.assign({
-                            filter: `post_id:${model.id}`,
-                            columns: ['id']
-                        }, _.pick(options, 'transacting')))
-                        .then((revisions) => {
-                            // Store previous + latest lexical content
-                            if (!revisions.length && options.method !== 'insert') {
-                                model.set('post_revisions', [{
-                                    post_id: model.id,
-                                    lexical: model.previous('lexical'),
-                                    created_at_ts: Date.now() - 1
-                                }, {
-                                    post_id: model.id,
-                                    lexical: model.get('lexical'),
-                                    created_at_ts: Date.now()
-                                }]);
-                            } else {
-                                const revisionsJSON = revisions.toJSON().slice(0, POST_REVISIONS_COUNT - 1);
-
-                                model.set('post_revisions', revisionsJSON.concat([{
-                                    post_id: model.id,
-                                    lexical: model.get('lexical'),
-                                    created_at_ts: Date.now()
-                                }]));
-                            }
-                        });
-                });
-            }
-        } else {
-            if (!model.get('mobiledoc') && !options.importing && !options.migrating) {
-                const postRevisions = new PostRevisions({
-                    config: {
-                        max_revisions: POST_REVISIONS_COUNT,
-                        revision_interval_ms: POST_REVISIONS_INTERVAL_MS
-                    }
-                });
-                const authorId = this.contextUser(options);
-                ops.push(async function updateRevisions() {
-                    const revisionModels = await ghostBookshelf.model('PostRevision')
-                        .findAll(Object.assign({
-                            filter: `post_id:${model.id}`,
-                            columns: ['id', 'lexical', 'created_at', 'author_id', 'title', 'reason', 'post_status', 'created_at_ts', 'feature_image']
-                        }, _.pick(options, 'transacting')));
-
-                    const revisions = revisionModels.toJSON();
-
-                    const current = {
-                        id: model.id,
-                        lexical: model.get('lexical'),
-                        html: model.get('html'),
-                        author_id: authorId,
-                        feature_image: model.get('feature_image'),
-                        feature_image_alt: model.get('posts_meta')?.feature_image_alt,
-                        feature_image_caption: model.get('posts_meta')?.feature_image_caption,
-                        title: model.get('title'),
-                        post_status: model.get('status')
-                    };
-
-                    // This can be refactored once we have the status stored in each revision
-                    const revisionOptions = {
-                        forceRevision: options.save_revision,
-                        isPublished: newStatus === 'published',
-                        newStatus,
-                        olderStatus
-                    };
-                    const newRevisions = await postRevisions.getRevisions(current, revisions, revisionOptions);
-                    model.set('post_revisions', newRevisions);
-                });
-            }
+                // This can be refactored once we have the status stored in each revision
+                const revisionOptions = {
+                    forceRevision: options.save_revision,
+                    isPublished: newStatus === 'published',
+                    newStatus,
+                    olderStatus
+                };
+                const newRevisions = await postRevisions.getRevisions(current, revisions, revisionOptions);
+                model.set('post_revisions', newRevisions);
+            });
         }
 
         if (this.get('tiers')) {

package/core/server/services/Users.js

@@ -5,7 +5,6 @@ const path = require('path');
  * @TODO: pass these in as dependencies
  */
 const {PostRevisions} = require('@tryghost/post-revisions');
-const labs = require('../../shared/labs');
 
 /**
  * @typedef {Object} IdbBackup
@@ -156,15 +155,13 @@ class Users {
         return this.models.Base.transaction(async (t) => {
             frameOptions.transacting = t;
 
-            if (labs.isSet('postHistory')) {
-                const postRevisions = new PostRevisions({
-                    model: this.models.PostRevision
-                });
+            const postRevisions = new PostRevisions({
+                model: this.models.PostRevision
+            });
 
-                await postRevisions.removeAuthorFromRevisions(frameOptions.id, {
-                    transacting: frameOptions.transacting
-                });
-            }
+            await postRevisions.removeAuthorFromRevisions(frameOptions.id, {
+                transacting: frameOptions.transacting
+            });
 
             await this.assignTagToUserPosts({
                 id: frameOptions.id,

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

@@ -0,0 +1,23 @@
+class PostsDataRepositoryBookshelf {
+    Post;
+
+    /**
+     * @param {Object} deps
+     * @param {import('../../models/post')} deps.Post
+     */
+    constructor(deps) {
+        this.Post = deps.Post;
+    }
+
+    /**
+     * @param {string[]} ids
+     * @returns {Promise<import('../../models/post')>}
+     **/
+    async getBulk(ids) {
+        return await this.Post.fetchAll({
+            filter: `id:[${ids.join(',')}]`
+        });
+    }
+}
+
+module.exports = PostsDataRepositoryBookshelf;

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

@@ -1,20 +1,26 @@
-const {CollectionsService, CollectionsRepositoryInMemory} = require('@tryghost/collections');
+const {
+    CollectionsService,
+    CollectionsRepositoryInMemory
+} = require('@tryghost/collections');
 
 class CollectionsServiceWrapper {
     api;
 
     constructor() {
-        const inMemoryCollectionsRepository = new CollectionsRepositoryInMemory();
+        const collectionsRepositoryInMemory = new CollectionsRepositoryInMemory();
+
         const collectionsService = new CollectionsService({
-            repository: inMemoryCollectionsRepository
+            collectionsRepository: collectionsRepositoryInMemory
         });
 
         this.api = {
             browse: collectionsService.getAll.bind(collectionsService),
             read: collectionsService.getById.bind(collectionsService),
-            add: collectionsService.save.bind(collectionsService),
+            add: collectionsService.createCollection.bind(collectionsService),
             edit: collectionsService.edit.bind(collectionsService),
-            destroy: collectionsService.destroy.bind(collectionsService)
+            addPost: collectionsService.addPostToCollection.bind(collectionsService),
+            destroy: collectionsService.destroy.bind(collectionsService),
+            destroyCollectionPost: collectionsService.removePostFromCollection.bind(collectionsService)
         };
     }
 }

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

@@ -24,6 +24,8 @@ module.exports = function apiRoutes() {
     router.post('/collections', mw.authAdminApi, labs.enabledMiddleware('collections'), http(api.collections.add));
     router.put('/collections/:id', mw.authAdminApi, labs.enabledMiddleware('collections'), http(api.collections.edit));
     router.del('/collections/:id', mw.authAdminApi, labs.enabledMiddleware('collections'), http(api.collections.destroy));
+    router.post('/collections/:id/posts', mw.authAdminApi, labs.enabledMiddleware('collections'), http(api.collections.addPost));
+    router.del('/collections/:id/posts/:post_id', mw.authAdminApi, labs.enabledMiddleware('collections'), http(api.collections.destroyPost));
 
     // ## Configuration
     router.get('/config', mw.authAdminApi, http(api.config.read));

package/core/shared/config/defaults.json

@@ -176,7 +176,7 @@
     },
     "portal": {
         "url": "https://cdn.jsdelivr.net/ghost/portal@~{version}/umd/portal.min.js",
-        "version": "2.32"
+        "version": "2.33"
     },
     "sodoSearch": {
         "url": "https://cdn.jsdelivr.net/ghost/sodo-search@~{version}/umd/sodo-search.min.js",