ghost 4.32.0 → 4.33.0

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

@@ -777,11 +777,11 @@
         font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue", sans-serif;
         font-size: 0.95em;
         font-weight: 600;
-        text-decoration: none !important;
+        text-decoration: none;
         border-radius: 5px;
         transition: opacity 0.2s ease-in-out;
         background-color: var(--ghost-accent-color);
-        color: #ffffff !important;
+        color: #ffffff;
         margin: 1.75em 0 0;
     }
 
@@ -800,12 +800,12 @@
     .kg-header-card.kg-style-image a.kg-header-card-button,
     .kg-header-card.kg-style-dark a.kg-header-card-button {
         background: #ffffff;
-        color: #15171a !important;
+        color: #15171a;
     }
 
     .kg-header-card.kg-style-accent a.kg-header-card-button {
         background: #ffffff;
-        color: var(--ghost-accent-color) !important;
+        color: var(--ghost-accent-color);
     }
 
     .kg-audio-card {

package/core/frontend/helpers/date.js

@@ -25,12 +25,11 @@ module.exports = function (...attrs) {
     // ensure that date is undefined, not null, as that can cause errors
     date = date === null ? undefined : date;
 
-    const timezone = options.data.site.timezone;
-    const locale = options.data.site.locale;
-
     const {
         format = 'll',
-        timeago
+        timeago,
+        timezone = options.data.site.timezone,
+        locale = options.data.site.locale
     } = options.hash;
 
     const timeNow = moment().tz(timezone);

package/core/frontend/meta/description.js

@@ -51,7 +51,7 @@ function getDescription(data, root, options = {}) {
                 || settingsCache.get('description')
                 || '';
         } else {
-            description = data.post.meta_description || '';
+            description = data.post.meta_description || data.post.custom_excerpt || '';
         }
     } else if (_.includes(context, 'page') && data.post) {
         // Page description dependent on legacy object formatting (https://github.com/TryGhost/Ghost/issues/10042)
@@ -63,7 +63,7 @@ function getDescription(data, root, options = {}) {
                 || settingsCache.get('description')
                 || '';
         } else {
-            description = data.post.meta_description || '';
+            description = data.post.meta_description || data.post.custom_excerpt || '';
         }
     } else if (_.includes(context, 'page') && data.page) {
         if (options.property) {
@@ -74,7 +74,7 @@ function getDescription(data, root, options = {}) {
                 || settingsCache.get('description')
                 || '';
         } else {
-            description = data.page.meta_description || '';
+            description = data.page.meta_description || data.page.custom_excerpt || '';
         }
     }
 

package/core/frontend/services/routing/config/canary.js

@@ -54,7 +54,7 @@ module.exports.TAXONOMIES = {
     },
     author: {
         filter: 'authors:\'%s\'',
-        editRedirect: '#/staff/:slug/',
+        editRedirect: '#/settings/staff/:slug/',
         resource: 'authors'
     }
 };

package/core/frontend/services/routing/config/v4.js

@@ -54,7 +54,7 @@ module.exports.TAXONOMIES = {
     },
     author: {
         filter: 'authors:\'%s\'',
-        editRedirect: '#/staff/:slug/',
+        editRedirect: '#/settings/staff/:slug/',
         resource: 'authors'
     }
 };

package/core/frontend/services/sitemap/base-generator.js

@@ -17,12 +17,12 @@ class BaseSiteMapGenerator {
     constructor() {
         this.nodeLookup = {};
         this.nodeTimeLookup = {};
-        this.siteMapContent = null;
+        this.siteMapContent = new Map();
         this.lastModified = 0;
-        this.maxNodes = 50000;
+        this.maxPerPage = 50000;
     }
 
-    generateXmlFromNodes() {
+    generateXmlFromNodes(page) {
         // Get a mapping of node to timestamp
         let nodesToProcess = _.map(this.nodeLookup, (node, id) => {
             return {
@@ -33,20 +33,23 @@ class BaseSiteMapGenerator {
             };
         });
 
-        // Limit to 50k nodes - this is a quick fix to prevent errors in google console
-        if (this.maxNodes) {
-            nodesToProcess = nodesToProcess.slice(0, this.maxNodes);
-        }
-
         // Sort nodes by timestamp
         nodesToProcess = _.sortBy(nodesToProcess, 'ts');
 
+        // Get the page of nodes that was requested
+        nodesToProcess = nodesToProcess.slice((page - 1) * this.maxPerPage, page * this.maxPerPage);
+
+        // Do not generate empty sitemaps
+        if (nodesToProcess.length === 0) {
+            return null;
+        }
+
         // Grab just the nodes
-        nodesToProcess = _.map(nodesToProcess, 'node');
+        const nodes = _.map(nodesToProcess, 'node');
 
         const data = {
             // Concat the elements to the _attr declaration
-            urlset: [XMLNS_DECLS].concat(nodesToProcess)
+            urlset: [XMLNS_DECLS].concat(nodes)
         };
 
         // Generate full xml
@@ -67,7 +70,7 @@ class BaseSiteMapGenerator {
             this.updateLastModified(datum);
             this.updateLookups(datum, node);
             // force regeneration of xml
-            this.siteMapContent = null;
+            this.siteMapContent.clear();
         }
     }
 
@@ -75,7 +78,7 @@ class BaseSiteMapGenerator {
         this.removeFromLookups(datum);
 
         // force regeneration of xml
-        this.siteMapContent = null;
+        this.siteMapContent.clear();
         this.lastModified = Date.now();
     }
 
@@ -152,13 +155,13 @@ class BaseSiteMapGenerator {
         return !!imageUrl;
     }
 
-    getXml() {
-        if (this.siteMapContent) {
-            return this.siteMapContent;
+    getXml(page = 1) {
+        if (this.siteMapContent.has(page)) {
+            return this.siteMapContent.get(page);
         }
 
-        const content = this.generateXmlFromNodes();
-        this.siteMapContent = content;
+        const content = this.generateXmlFromNodes(page);
+        this.siteMapContent.set(page, content);
         return content;
     }
 
@@ -181,7 +184,7 @@ class BaseSiteMapGenerator {
     reset() {
         this.nodeLookup = {};
         this.nodeTimeLookup = {};
-        this.siteMapContent = null;
+        this.siteMapContent.clear();
     }
 }
 

package/core/frontend/services/sitemap/handler.js

@@ -5,7 +5,8 @@ const manager = new Manager();
 // Responsible for handling requests for sitemap files
 module.exports = function handler(siteApp) {
     const verifyResourceType = function verifyResourceType(req, res, next) {
-        if (!Object.prototype.hasOwnProperty.call(manager, req.params.resource)) {
+        const resourceWithoutPage = req.params.resource.replace(/-\d+$/, '');
+        if (!Object.prototype.hasOwnProperty.call(manager, resourceWithoutPage)) {
             return res.sendStatus(404);
         }
 
@@ -22,14 +23,22 @@ module.exports = function handler(siteApp) {
     });
 
     siteApp.get('/sitemap-:resource.xml', verifyResourceType, function sitemapResourceXML(req, res) {
-        const type = req.params.resource;
-        const page = 1;
+        const type = req.params.resource.replace(/-\d+$/, '');
+        const pageParam = (req.params.resource.match(/-(\d+)$/) || [null, null])[1];
+        const page = pageParam ? parseInt(pageParam, 10) : 1;
+
+        const content = manager.getSiteMapXml(type, page);
+        // Prevent x-1.xml as it is a duplicate of x.xml and empty sitemaps
+        // (except for the first page so that at least one sitemap exists per type)
+        if (pageParam === '1' || (!content && page !== 1)) {
+            return res.sendStatus(404);
+        }
 
         res.set({
             'Cache-Control': 'public, max-age=' + config.get('caching:sitemap:maxAge'),
             'Content-Type': 'text/xml'
         });
 
-        res.send(manager.getSiteMapXml(type, page));
+        res.send(content);
     });
 };

package/core/frontend/services/sitemap/index-generator.js

@@ -14,6 +14,7 @@ class SiteMapIndexGenerator {
     constructor(options) {
         options = options || {};
         this.types = options.types;
+        this.maxPerPage = options.maxPerPage;
     }
 
     getXml() {
@@ -30,16 +31,25 @@ class SiteMapIndexGenerator {
 
     generateSiteMapUrlElements() {
         return _.map(this.types, (resourceType) => {
-            const url = urlUtils.urlFor({relativeUrl: '/sitemap-' + resourceType.name + '.xml'}, true);
-            const lastModified = resourceType.lastModified;
-
-            return {
-                sitemap: [
-                    {loc: url},
-                    {lastmod: moment(lastModified).toISOString()}
-                ]
-            };
-        });
+            // `|| 1` = even if there are no items we still have an empty sitemap file
+            const noOfPages = Math.ceil(Object.keys(resourceType.nodeLookup).length / this.maxPerPage) || 1;
+            const pages = [];
+
+            for (let i = 0; i < noOfPages; i++) {
+                const page = i === 0 ? '' : `-${i + 1}`;
+                const url = urlUtils.urlFor({relativeUrl: '/sitemap-' + resourceType.name + page + '.xml'}, true);
+                const lastModified = resourceType.lastModified;
+
+                pages.push({
+                    sitemap: [
+                        {loc: url},
+                        {lastmod: moment(lastModified).toISOString()}
+                    ]
+                });
+            }
+
+            return pages;
+        }).flat();
     }
 }
 

package/core/frontend/services/sitemap/manager.js

@@ -11,11 +11,13 @@ class SiteMapManager {
     constructor(options) {
         options = options || {};
 
+        options.maxPerPage = options.maxPerPage || 50000;
+
         this.pages = options.pages || this.createPagesGenerator(options);
         this.posts = options.posts || this.createPostsGenerator(options);
         this.users = this.authors = options.authors || this.createUsersGenerator(options);
         this.tags = options.tags || this.createTagsGenerator(options);
-        this.index = options.index || this.createIndexGenerator();
+        this.index = options.index || this.createIndexGenerator(options);
 
         events.on('router.created', (router) => {
             if (router.name === 'StaticRoutesRouter') {
@@ -43,14 +45,15 @@ class SiteMapManager {
         });
     }
 
-    createIndexGenerator() {
+    createIndexGenerator(options) {
         return new IndexMapGenerator({
             types: {
                 pages: this.pages,
                 posts: this.posts,
                 authors: this.authors,
                 tags: this.tags
-            }
+            },
+            maxPerPage: options.maxPerPage
         });
     }
 
@@ -74,8 +77,8 @@ class SiteMapManager {
         return this.index.getXml();
     }
 
-    getSiteMapXml(type) {
-        return this[type].getXml();
+    getSiteMapXml(type, page) {
+        return this[type].getXml(page);
     }
 }
 

package/core/frontend/services/theme-engine/middleware/update-global-template-options.js

@@ -28,7 +28,9 @@ function calculateLegacyPriceData(products) {
         };
     }
 
-    const defaultProduct = products[0] || {};
+    const defaultProduct = products.find((product) => {
+        return product.type === 'paid';
+    }) || {};
 
     const monthlyPrice = makePriceObject(defaultProduct.monthly_price || defaultPrice);
 

package/core/frontend/services/theme-engine/middleware/update-local-template-options.js

@@ -2,7 +2,6 @@ const _ = require('lodash');
 const hbs = require('../engine');
 const urlUtils = require('../../../../shared/url-utils');
 const customThemeSettingsCache = require('../../../../shared/custom-theme-settings-cache');
-const labs = require('../../../../shared/labs');
 const preview = require('../preview');
 
 function updateLocalTemplateOptions(req, res, next) {
@@ -17,12 +16,8 @@ function updateLocalTemplateOptions(req, res, next) {
     const previewData = preview.handle(req, Object.keys(customThemeSettingsCache.getAll()));
 
     // strip custom off of preview data so it doesn't get merged into @site
-    const customThemeSettingsPreviewData = previewData.custom;
+    const customData = previewData.custom;
     delete previewData.custom;
-    let customData = {};
-    if (labs.isSet('customThemeSettings')) {
-        customData = customThemeSettingsPreviewData;
-    }
 
     // update site data with any preview values from the request
     Object.assign(siteData, previewData);

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

@@ -1,3 +1,8 @@
+.kg-audio-card,
+.kg-audio-card * {
+    box-sizing: border-box;
+}
+
 .kg-audio-card {
     display: flex;
     width: 100%;

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

@@ -1,3 +1,8 @@
+.kg-bookmark-card,
+.kg-bookmark-card * {
+    box-sizing: border-box;
+}
+
 .kg-bookmark-card,
 .kg-bookmark-publisher {
     position: relative;

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

@@ -1,3 +1,8 @@
+.kg-button-card,
+.kg-button-card * {
+    box-sizing: border-box;
+}
+
 .kg-button-card {
     display: flex;
     position: static;

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

@@ -1,3 +1,8 @@
+.kg-callout-card,
+.kg-callout-card * {
+    box-sizing: border-box;
+}
+
 .kg-callout-card {
     display: flex;
     padding: 1.2em 1.6em;

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

@@ -1,3 +1,8 @@
+.kg-file-card,
+.kg-file-card * {
+    box-sizing: border-box;
+}
+
 .kg-file-card {
     display: flex;
 }
@@ -41,7 +46,7 @@
 }
 
 .kg-file-card-title + .kg-file-card-caption {
-    margin-top: -6px;
+    margin-top: -3px;
 }
 
 .kg-file-card-metadata {

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

@@ -1,3 +1,8 @@
+.kg-gallery-card,
+.kg-gallery-card * {
+    box-sizing: border-box;
+}
+
 .kg-gallery-card,
 .kg-image-card {
     --gap: 1.2rem;

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

@@ -1,3 +1,8 @@
+.kg-header-card,
+.kg-header-card * {
+    box-sizing: border-box;
+}
+
 .kg-header-card {
     padding: 12vmin 4em;
     min-height: 60vh;

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

@@ -1,3 +1,8 @@
+.kg-nft-card,
+.kg-nft-card * {
+    box-sizing: border-box;
+}
+
 .kg-nft-card {
     display: flex;
     flex-direction: column;

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

@@ -1,3 +1,8 @@
+.kg-product-card,
+.kg-product-card * {
+    box-sizing: border-box;
+}
+
 .kg-product-card {
     display: flex;
     align-items: center;

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

@@ -1,3 +1,8 @@
+.kg-toggle-card,
+.kg-toggle-card * {
+    box-sizing: border-box;
+}
+
 .kg-toggle-card {
     background: transparent;
     box-shadow: inset 0 0 0 1px rgba(124, 139, 154, 0.25);

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

@@ -1,3 +1,7 @@
+.kg-video-card,
+.kg-video-card * {
+    box-sizing: border-box;
+}
 
 .kg-video-card {
     position: relative;

package/core/frontend/views/unsubscribe.hbs

@@ -33,16 +33,21 @@
                             </a>
                         </nav>
                     </header>
-    
+
                     <div class="gh-flow-content-wrap">
                         <section class="gh-flow-content gh-flow-content-unsubscribe">
-                            <p>
-                                {{#if error}}
-                                    {{error}}
-                                {{else}}
-                                    {{#if member}}<span class="gh-flow-em">{{member.email}}</span> has been successfully unsubscribed.{{/if}}
+                            {{#if error}}
+                                <p>{{error}}</p>
+                            {{else}}
+                                {{#if member}}
+                                    <p>
+                                        <span class="gh-flow-em">{{member.email}}</span> has been successfully unsubscribed from emails.
+                                        <br>
+                                        Don't worry, this will not cancel your paid subscription to {{@site.title}}.
+                                    </p>
+                                    <p>Didn't mean to do this? Manage your account <a href="{{@site.url}}/#/portal/account">here</a>.</p>
                                 {{/if}}
-                            </p>
+                            {{/if}}
                         </section>
                     </div>
                 </div>

package/core/frontend/web/site.js

@@ -22,7 +22,6 @@ const siteRoutes = require('./routes');
 const shared = require('../../server/web/shared');
 const errorHandler = require('@tryghost/mw-error-handler');
 const mw = require('./middleware');
-const labs = require('../../shared/labs');
 
 const STATIC_IMAGE_URL_PREFIX = `/${urlUtils.STATIC_IMAGE_URL_PREFIX}`;
 const STATIC_MEDIA_URL_PREFIX = `/${constants.STATIC_MEDIA_URL_PREFIX}`;
@@ -118,15 +117,19 @@ module.exports = function setupSiteApp(options = {}) {
     // Serve blog images using the storage adapter
     siteApp.use(STATIC_IMAGE_URL_PREFIX, mw.handleImageSizes, storage.getStorage('images').serve());
     // Serve blog media using the storage adapter
-    siteApp.use(STATIC_MEDIA_URL_PREFIX, labs.enabledMiddleware('mediaAPI'), storage.getStorage('media').serve());
+    siteApp.use(STATIC_MEDIA_URL_PREFIX, storage.getStorage('media').serve());
     // Serve blog files using the storage adapter
-    siteApp.use(STATIC_FILES_URL_PREFIX, labs.enabledMiddleware('filesAPI'), storage.getStorage('files').serve());
+    siteApp.use(STATIC_FILES_URL_PREFIX, storage.getStorage('files').serve());
 
     // Global handling for member session, ensures a member is logged in to the frontend
     siteApp.use(membersService.middleware.loadMemberSession);
 
     // /member/.well-known/* serves files (e.g. jwks.json) so it needs to be mounted before the prettyUrl mw to avoid trailing slashes
-    siteApp.use('/members/.well-known', (req, res, next) => membersService.api.middleware.wellKnown(req, res, next));
+    siteApp.use(
+        '/members/.well-known',
+        shared.middleware.cacheControl('public', {maxAge: 60 * 60 * 24}),
+        (req, res, next) => membersService.api.middleware.wellKnown(req, res, next)
+    );
 
     // setup middleware for internal apps
     // @TODO: refactor this to be a proper app middleware hook for internal apps

package/core/server/api/canary/settings.js

@@ -6,6 +6,7 @@ const tpl = require('@tryghost/tpl');
 const {BadRequestError} = require('@tryghost/errors');
 const settingsService = require('../../services/settings');
 const membersService = require('../../services/members');
+const stripeService = require('../../services/stripe');
 
 const settingsBREADService = settingsService.getSettingsBREADServiceInstance();
 
@@ -132,7 +133,7 @@ module.exports = {
                 });
             }
 
-            await membersService.api.disconnectStripe();
+            await stripeService.disconnect();
 
             return models.Settings.edit([{
                 key: 'stripe_connect_publishable_key',

package/core/server/api/canary/utils/serializers/output/products.js

@@ -73,6 +73,8 @@ function serializeProduct(product, options, apiType) {
         name: json.name,
         description: json.description,
         slug: json.slug,
+        active: json.active,
+        type: json.type,
         created_at: json.created_at,
         updated_at: json.updated_at,
         stripe_prices: json.stripePrices ? json.stripePrices.map(price => serializeStripePrice(price, hideStripeData)) : null,
@@ -160,6 +162,8 @@ function createSerializer(debugString, serialize) {
  * @prop {string} name
  * @prop {string} slug
  * @prop {string} description
+ * @prop {boolean} active
+ * @prop {string} type
  * @prop {Date} created_at
  * @prop {Date} updated_at
  * @prop {StripePrice[]} [stripe_prices]

package/core/server/data/db/info.js

@@ -0,0 +1,4 @@
+const connection = require('./connection');
+const DatabaseInfo = require('@tryghost/database-info');
+
+module.exports = new DatabaseInfo(connection);

package/core/server/data/migrations/versions/4.33/2022-01-14-11-50-add-type-column-to-products.js

@@ -0,0 +1,12 @@
+const utils = require('../../utils');
+
+module.exports = utils.createAddColumnMigration(
+    'products',
+    'type',
+    {
+        type: 'string',
+        maxlength: 50,
+        nullable: false,
+        defaultTo: 'paid'
+    }
+);

package/core/server/data/migrations/versions/4.33/2022-01-14-11-51-add-default-free-tier.js

@@ -0,0 +1,37 @@
+const {createTransactionalMigration} = require('../../utils');
+const ObjectID = require('bson-objectid');
+const {slugify} = require('@tryghost/string');
+const logging = require('@tryghost/logging');
+
+module.exports = createTransactionalMigration(
+    async function up(knex) {
+        const [result] = await knex
+            .count('id', {as: 'total'})
+            .from('products')
+            .where('type', 'free');
+
+        if (result.total !== 0) {
+            logging.warn(`Not adding default free tier, a free tier already exists`);
+            return;
+        }
+
+        const name = 'Free';
+        const id = ObjectID().toHexString();
+
+        logging.info(`Adding tier "${name}"`);
+        await knex('products')
+            .insert({
+                id: id,
+                name: name,
+                type: 'free',
+                slug: slugify(id),
+                created_at: knex.raw(`CURRENT_TIMESTAMP`)
+            });
+    },
+    async function down(knex) {
+        logging.info('Removing free tier');
+        await knex('products')
+            .where('type', 'free')
+            .del();
+    }
+);