ghost 5.54.4 → 5.55.0

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.54%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.55%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" />
@@ -56,9 +56,9 @@
 
     <div id="ember-basic-dropdown-wormhole"></div>
 
-    <script src="assets/vendor-0d244308df4eb04209cbd5fa6abe358b.js"></script>
-<script src="assets/chunk.486.3896d2a7816cf03a0794.js"></script>
-<script src="assets/chunk.143.3416d003faf26a5d1543.js"></script>
-    <script src="assets/ghost-14eecea754ec854244d71e1300ec75f2.js"></script>
+    <script src="assets/vendor-0a8fc851393c473cd269f04fc4e97974.js"></script>
+<script src="assets/chunk.757.c768dcbeaf1cee916395.js"></script>
+<script src="assets/chunk.143.60a057de7aaa4abc6a26.js"></script>
+    <script src="assets/ghost-135607a3c421c472feb9f59f14c625fb.js"></script>
 </body>
 </html>

package/core/frontend/helpers/collection.js

@@ -0,0 +1,146 @@
+// # Get Helper
+// Usage: `{{#get "posts" limit="5"}}`, `{{#get "tags" limit="all"}}`
+// Fetches data from the API
+const {config, api, prepareContextResource} = require('../services/proxy');
+const {hbs} = require('../services/handlebars');
+
+const logging = require('@tryghost/logging');
+const errors = require('@tryghost/errors');
+const tpl = require('@tryghost/tpl');
+
+const messages = {
+    mustBeCalledAsBlock: 'The {\\{{helperName}}} helper must be called as a block. E.g. {{#{helperName}}}...{{/{helperName}}}',
+    invalidResource: 'Invalid "{resource}" resource given to get helper'
+};
+
+const createFrame = hbs.handlebars.createFrame;
+
+/**
+ * ## Parse Options
+ * Ensure options passed in make sense
+ *
+ * @param {Object} options
+ * @returns {*}
+ */
+function parseOptions(options) {
+    if (options.limit === 'all' || !options.limit) {
+        return {
+            limit: 3
+        };
+    }
+
+    return {
+        limit: options.limit
+    };
+}
+
+/**
+ *
+ * @param {String} resource
+ * @param {String} controllerName
+ * @param {String} action
+ * @param {Object} apiOptions
+ * @returns {Promise<Object>}
+ */
+async function makeAPICall(resource, controllerName, action, apiOptions) {
+    const controller = api[controllerName];
+
+    let timer;
+
+    try {
+        let response;
+
+        if (config.get('optimization:getHelper:timeout:threshold')) {
+            const logLevel = config.get('optimization:getHelper:timeout:level') || 'error';
+            const threshold = config.get('optimization:getHelper:timeout:threshold');
+
+            const apiResponse = controller[action](apiOptions);
+
+            const timeout = new Promise((resolve) => {
+                timer = setTimeout(() => {
+                    logging[logLevel](new errors.HelperWarning({
+                        message: `{{#get}} took longer than ${threshold}ms and was aborted`,
+                        code: 'ABORTED_GET_HELPER',
+                        errorDetails: {
+                            api: `${controllerName}.${action}`,
+                            apiOptions
+                        }
+                    }));
+
+                    resolve({[resource]: []});
+                }, threshold);
+            });
+
+            response = await Promise.race([apiResponse, timeout]);
+            clearTimeout(timer);
+        } else {
+            response = await controller[action](apiOptions);
+        }
+
+        return response;
+    } catch (err) {
+        clearTimeout(timer);
+        throw err;
+    }
+}
+
+/**
+ * ## Get
+ * @param {string} slug
+ * @param {object} options
+ * @returns {Promise<any>}
+ */
+module.exports = async function collection(slug, options) {
+    options = options || {};
+    options.hash = options.hash || {};
+    options.data = options.data || {};
+
+    const self = this;
+    const data = createFrame(options.data);
+
+    let apiOptions = options.hash;
+
+    if (!options.fn) {
+        data.error = tpl(messages.mustBeCalledAsBlock, {helperName: 'collection'});
+        logging.warn(data.error);
+        return;
+    }
+
+    const resource = 'posts';
+    const controllerName = 'postsPublic';
+    const action = 'browse';
+
+    // Parse the options we're going to pass to the API
+    apiOptions = parseOptions(apiOptions);
+    apiOptions.context = {member: data.member};
+    apiOptions.collection = slug;
+
+    try {
+        const response = await makeAPICall(resource, controllerName, action, apiOptions);
+
+        // prepare data properties for use with handlebars
+        if (response[resource] && response[resource].length) {
+            response[resource].forEach(prepareContextResource);
+        }
+
+        // block params allows the theme developer to name the data using something like
+        // `{{#get "posts" as |result pageInfo|}}`
+        const blockParams = [response[resource]];
+        if (response.meta && response.meta.pagination) {
+            response.pagination = response.meta.pagination;
+            blockParams.push(response.meta.pagination);
+        }
+
+        // Call the main template function
+        return options.fn(response, {
+            data: data,
+            blockParams: blockParams
+        });
+    } catch (error) {
+        logging.error(error);
+        data.error = error.message;
+        return options.inverse(self, {data: data});
+    }
+};
+
+module.exports.async = true;

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

@@ -0,0 +1,283 @@
+.kg-header-card-v2 {
+    position: relative;
+}
+
+.kg-header-card-v2,
+.kg-header-card-v2 * {
+    box-sizing: border-box;
+}
+
+.kg-header-card-v2 a,
+.kg-header-card-v2 a span {
+    color: currentColor;
+}
+
+.kg-header-card-v2.kg-style-accent {
+    background-color: var(--ghost-accent-color);
+}
+
+.kg-layout-split .kg-header-card-v2-content {
+    display: grid;
+    grid-template-columns: 1fr 1fr;
+}
+
+.kg-header-card-v2-text {
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    justify-content: center;
+    height: 100%;
+    padding: 4vmax;
+    background-size: cover;
+    background-position: center;
+    text-align: left;
+}
+
+.kg-width-wide .kg-header-card-v2-text {
+    padding: 6.4vmax;
+}
+
+.kg-width-full .kg-header-card-v2-text {
+    padding: 12vmax 0;
+}
+
+.kg-layout-split .kg-header-card-v2-text {
+    padding: 12vmax 4vmax;
+}
+
+.kg-layout-split.kg-content-wide .kg-header-card-v2-text {
+    padding: 10vmax 0 10vmax 4vmax;
+}
+
+.kg-layout-split.kg-content-wide.kg-swapped .kg-header-card-v2-text {
+    padding: 10vmax 4vmax 10vmax 0;
+}
+
+.kg-swapped .kg-header-card-v2-text {
+    grid-row: 1;
+}
+
+.kg-header-card-v2-text.kg-align-center {
+    align-items: center;
+    text-align: center;
+}
+
+.kg-header-card-v2.kg-style-image h2.kg-header-card-v2-heading,
+.kg-header-card-v2.kg-style-image h3.kg-header-card-v2-subheading,
+.kg-header-card-v2.kg-style-image .kg-header-card-v2-button {
+    z-index: 999;
+}
+
+/* Background image */
+
+.kg-header-card-v2 > picture > .kg-header-card-v2-image {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+    object-position: center;
+    background-color: #FFFFFF;
+    pointer-events: none;
+}
+
+/* Split layout image */
+
+.kg-header-card-v2-content .kg-header-card-v2-image {
+    /* this will force the image to follow the signup card height */
+    height: 0;
+    min-height: 100%;
+    /**/
+    object-fit: cover;
+    object-position: center;
+}
+
+.kg-content-wide .kg-header-card-v2-content .kg-header-card-v2-image {
+    height: 100%;
+    padding: 8rem 0;
+    object-fit: contain;
+}
+
+/* Heading */
+
+.kg-header-card-v2 h2.kg-header-card-v2-heading {
+    margin: 0;
+    font-size: clamp(2.8rem, 4vw, 4rem);
+    font-weight: 700;
+    line-height: 1em;
+    letter-spacing: -0.01em;
+}
+
+.kg-header-card-v2.kg-width-wide h2.kg-header-card-v2-heading {
+    font-size: clamp(2.8rem, 5vw, 5.2rem);
+}
+
+.kg-header-card-v2.kg-width-full h2.kg-header-card-v2-heading {
+    font-size: clamp(3.6rem, 5.6vw, 6.4rem);
+}
+
+.kg-header-card-v2.kg-width-full.kg-layout-split h2.kg-header-card-v2-heading {
+    font-size: clamp(3.2rem, 4vw, 5.6rem);
+}
+
+.kg-header-card-v2.kg-width-full.kg-layout-split.kg-content-wide h2.kg-header-card-v2-heading {
+    font-size: clamp(2.8rem, 4vw, 5.2rem);
+}
+
+/* Subheading */
+
+.kg-header-card-v2-subheading {
+    margin: 0 0 2em;
+}
+
+.kg-header-card-v2 h3.kg-header-card-v2-subheading {
+    max-width: 40em;
+    margin: 0;
+    font-size: clamp(1.05em, 2vw, 2rem);
+    font-weight: 500;
+    line-height: 1.4em;
+}
+
+.kg-header-card-v2 h2 + h3.kg-header-card-v2-subheading {
+    margin: 0.6em 0 0;
+}
+
+.kg-header-card-v2 h3.kg-header-card-v2-subheading strong {
+    font-weight: 600;
+}
+
+.kg-header-card-v2.kg-width-wide h3.kg-header-card-v2-subheading {
+    font-size: clamp(1.05em, 2vw, 2.4rem);
+}
+
+.kg-header-card-v2.kg-width-full h3.kg-header-card-v2-subheading:not(.kg-layout-split h3.kg-header-card-v2-subheading) {
+    max-width: 65vmax;
+    font-size: clamp(1.05em, 2vw, 2.6rem);
+}
+
+.kg-header-card-v2.kg-width-full.kg-layout-split h3.kg-header-card-v2-subheading {
+    font-size: clamp(1.05em, 2vw, 2.4rem);
+}
+
+.kg-width-wide .kg-header-card-v2-fields,
+.kg-width-full .kg-header-card-v2-fields {
+    width: 100%;
+    max-width: 500px;
+}
+
+.kg-header-card-v2-input {
+    width: 100%;
+    height: 4.6rem;
+    margin-right: 3px;
+    padding: 12px 16px;
+    border: none;
+    font-size: 1.1em;
+}
+
+.kg-header-card-v2-input:focus,
+.kg-header-card-v2-input:focus-visible {
+    outline: none;
+}
+
+.kg-header-card-v2-button {
+    display: flex;
+    position: relative;
+    align-items: center;
+    height: 4.6rem;
+    padding: 0 1.2em;
+    outline: none;
+    border: none;
+    font-size: 1em;
+    font-weight: 600;
+    line-height: 1em;
+    text-align: center;
+    text-decoration: none;
+    letter-spacing: .2px;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    border-radius: 3px;
+    transition: opacity .2s ease;
+}
+
+.kg-header-card-v2-button.kg-style-accent {
+    background-color: var(--ghost-accent-color);
+}
+
+.kg-header-card-v2 h2 + .kg-header-card-v2-button,
+.kg-header-card-v2 h3 + .kg-header-card-v2-button {
+    margin: 1.5em 0 0;
+}
+
+.kg-header-card-v2 .kg-header-card-v2-button:hover {
+    opacity: 0.85;
+}
+
+.kg-header-card-v2.kg-width-wide .kg-header-card-v2-button {
+    font-size: 1.05em;
+}
+
+.kg-header-card-v2.kg-width-wide h2 + .kg-header-card-v2-button,
+.kg-header-card-v2.kg-width-wide h3 + .kg-header-card-v2-button {
+    margin-top: 1.75em;
+}
+
+.kg-header-card-v2.kg-width-full .kg-header-card-v2-button {
+    font-size: 1.1em;
+}
+
+.kg-header-card-v2.kg-width-full h2 + .kg-header-card-v2-button,
+.kg-header-card-v2.kg-width-full h3 + .kg-header-card-v2-button {
+    margin-top: 2em;
+}
+
+/* Responsive styles */
+
+@media (max-width: 640px) {
+    .kg-layout-split .kg-header-card-v2-content {
+        grid-template-columns: 1fr;
+    }
+
+    .kg-width-wide .kg-header-card-v2-text {
+        padding: 6.4vmax 4vmax;
+    }
+
+    .kg-layout-split.kg-content-wide .kg-header-card-v2-text,
+    .kg-layout-split.kg-content-wide.kg-swapped .kg-header-card-v2-text {
+        padding: 9.6vmax 0;
+    }
+
+    .kg-header-card-v2.kg-width-full h3.kg-header-card-v2-subheading:not(.kg-layout-split h3.kg-header-card-v2-subheading) {
+        max-width: unset;
+    }
+
+    .kg-header-card-v2-content .kg-header-card-v2-image:not(.kg-content-wide .kg-header-card-v2-content .kg-header-card-v2-image) {
+        height: auto;
+        min-height: unset;
+        aspect-ratio: 1 / 1;
+    }
+
+    .kg-content-wide .kg-header-card-v2-content .kg-header-card-v2-image {
+        padding: 2.4rem 0 0;
+    }
+
+    .kg-content-wide.kg-swapped .kg-header-card-v2-content .kg-header-card-v2-image {
+        padding: 0 0 2.4rem;
+    }
+
+    .kg-header-card-v2-input {
+        height: 4.2rem;
+        padding: 6px 12px;
+        font-size: 1em;
+    }
+
+    .kg-header-card-v2-button {
+        height: 4.2rem;
+    }
+
+    .kg-header-card-v2.kg-width-wide .kg-header-card-v2-button,
+    .kg-header-card-v2.kg-width-full .kg-header-card-v2-button {
+        font-size: 1em;
+    }
+}

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

@@ -210,6 +210,7 @@
     margin-right: 3px;
     padding: 12px 16px;
     border: none;
+    background: #FFFFFF;
     font-size: 1.1em;
 }
 

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

@@ -25,25 +25,6 @@ module.exports = {
         }
     },
 
-    browsePosts: {
-        headers: {
-            cacheInvalidate: false
-        },
-        data: [
-            'id'
-        ],
-        options: [
-            'limit',
-            'page'
-        ],
-        permissions: {
-            method: 'browse'
-        },
-        query(frame) {
-            return collectionsService.api.getAllPosts(frame.data.id, frame.options);
-        }
-    },
-
     read: {
         headers: {
             cacheInvalidate: false

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

@@ -3,6 +3,8 @@ const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 const {mapQuery} = require('@tryghost/mongo-utils');
 const postsPublicService = require('../../services/posts-public');
+const getPostServiceInstance = require('../../services/posts/posts-service');
+const postsService = getPostServiceInstance();
 
 const allowedIncludes = ['tags', 'authors', 'tiers', 'sentiment'];
 
@@ -38,7 +40,8 @@ module.exports = {
             'order',
             'page',
             'debug',
-            'absolute_urls'
+            'absolute_urls',
+            'collection'
         ],
         validation: {
             options: {
@@ -56,7 +59,7 @@ module.exports = {
                 ...frame.options,
                 mongoTransformer: rejectPrivateFieldsTransformer
             };
-            return models.Post.findPage(options);
+            return postsService.browsePosts(options);
         }
     },
 

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

@@ -21,10 +21,6 @@ module.exports = {
         return require('./authentication');
     },
 
-    get collections() {
-        return require('./collections');
-    },
-
     get db() {
         return require('./db');
     },

package/core/server/data/migrations/versions/5.55/2023-07-10-05-15-55-add-built-in-collections.js

@@ -0,0 +1,60 @@
+const logging = require('@tryghost/logging');
+const {default: ObjectID} = require('bson-objectid');
+const {createTransactionalMigration} = require('../../utils');
+
+module.exports = createTransactionalMigration(
+    async function up(knex) {
+        logging.info('Creating built in collections');
+
+        const existingLatestCollection = await knex('collections')
+            .where({
+                slug: 'latest'
+            })
+            .first();
+
+        if (existingLatestCollection) {
+            logging.warn('Latest collection already exists, skipping');
+        } else {
+            await knex('collections').insert({
+                id: (new ObjectID()).toHexString(),
+                title: 'Latest',
+                slug: 'latest',
+                description: 'All posts',
+                type: 'automatic',
+                filter: '',
+                created_at: knex.raw('current_timestamp')
+            });
+        }
+
+        const existingFeaturedCollection = await knex('collections')
+            .where({
+                slug: 'featured'
+            })
+            .first();
+
+        if (existingFeaturedCollection) {
+            logging.warn('Featured collection already exists, skipping');
+        } else {
+            await knex('collections').insert({
+                id: (new ObjectID()).toHexString(),
+                title: 'Featured',
+                slug: 'featured',
+                description: 'Featured posts',
+                type: 'automatic',
+                filter: 'featured:true',
+                created_at: knex.raw('current_timestamp')
+            });
+        }
+    },
+    async function down(knex) {
+        logging.info('Deleting built in collections');
+
+        await knex('collections').where({
+            slug: 'latest'
+        }).del();
+
+        await knex('collections').where({
+            slug: 'featured'
+        }).del();
+    }
+);

package/core/server/data/migrations/versions/5.55/2023-07-10-05-16-55-add-built-in-collection-posts.js

@@ -0,0 +1,99 @@
+const logging = require('@tryghost/logging');
+const {default: ObjectID} = require('bson-objectid');
+const {createTransactionalMigration} = require('../../utils');
+
+const insertPostCollections = async (knex, collectionId, postIds) => {
+    logging.warn(`Batch inserting ${postIds.length} collection posts for collection ${collectionId}`);
+
+    const collectionPosts = postIds.map((postId) => {
+        return {
+            id: (new ObjectID()).toHexString(),
+            collection_id: collectionId,
+            post_id: postId,
+            sort_order: 0
+        };
+    });
+
+    await knex.batchInsert('collections_posts', collectionPosts, 1000);
+};
+
+module.exports = createTransactionalMigration(
+    async function up(knex) {
+        logging.info('Populating built-in collections');
+
+        const existingLatestCollection = await knex('collections')
+            .where({
+                slug: 'latest'
+            })
+            .first();
+
+        if (!existingLatestCollection) {
+            logging.warn('Latest collection does not exists, skipping');
+        } else {
+            const latestPostsRows = await knex('posts')
+                .select('id')
+                .where({
+                    type: 'post'
+                });
+
+            const latestPostsIds = latestPostsRows.map(row => row.id);
+
+            await insertPostCollections(knex, existingLatestCollection.id, latestPostsIds);
+        }
+
+        const existingFeaturedCollection = await knex('collections')
+            .where({
+                slug: 'featured'
+            })
+            .first();
+
+        if (!existingFeaturedCollection) {
+            logging.warn('Featured collection does not exist, skipping');
+        } else {
+            const featuredPostsRows = await knex('posts')
+                .select('id')
+                .where({
+                    featured: true,
+                    type: 'post'
+                });
+
+            const featuredPostsIds = featuredPostsRows.map(row => row.id);
+
+            await insertPostCollections(knex, existingFeaturedCollection.id, featuredPostsIds);
+        }
+    },
+    async function down(knex) {
+        logging.info('Deleting built in collection_posts');
+
+        const existingLatestCollection = await knex('collections')
+            .where({
+                slug: 'latest'
+            })
+            .first();
+
+        if (existingLatestCollection) {
+            logging.info(`Deleting collection_posts for latest collection: ${existingLatestCollection.id}`);
+            await knex('collections_posts')
+                .where({
+                    collection_id: existingLatestCollection.id
+                })
+                .del();
+        }
+
+        const existingFeaturedCollection = await knex('collections')
+            .where({
+                slug: 'featured'
+            })
+            .first();
+
+        if (existingFeaturedCollection) {
+            logging.info(`Deleting collection_posts for featured collection: ${existingFeaturedCollection.id}`);
+
+            await knex('collections_posts')
+                .where({
+                    collection_id: existingFeaturedCollection.id
+                })
+                .del();
+        }
+    }
+);