ghost 5.98.0 → 5.99.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%22editorUrl%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.98%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%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%2C%22editorFilename%22%3A%22koenig-lexical.umd.js%22%2C%22editorHash%22%3A%22ee37f0b9eb%22%2C%22adminXDemoFilename%22%3A%22admin-x-demo.js%22%2C%22adminXDemoHash%22%3A%221b17317b1f%22%2C%22adminXSettingsFilename%22%3A%22admin-x-settings.js%22%2C%22adminXSettingsHash%22%3A%22a887193dcd%22%2C%22adminXActivitypubFilename%22%3A%22admin-x-activitypub.js%22%2C%22adminXActivitypubHash%22%3A%22ad0a25d390%22%2C%22adminXActivitypubCustomUrl%22%3A%22https%3A%2F%2Fcdn.jsdelivr.net%2Fghost%2Fadmin-x-activitypub%400%2Fdist%2Fadmin-x-activitypub.js%22%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%22editorUrl%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.99%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%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%2C%22editorFilename%22%3A%22koenig-lexical.umd.js%22%2C%22editorHash%22%3A%22a724a31dfe%22%2C%22adminXDemoFilename%22%3A%22admin-x-demo.js%22%2C%22adminXDemoHash%22%3A%22118f338ce4%22%2C%22adminXSettingsFilename%22%3A%22admin-x-settings.js%22%2C%22adminXSettingsHash%22%3A%2224993c916e%22%2C%22adminXActivitypubFilename%22%3A%22admin-x-activitypub.js%22%2C%22adminXActivitypubHash%22%3A%22f172caf7c8%22%2C%22adminXActivitypubCustomUrl%22%3A%22https%3A%2F%2Fcdn.jsdelivr.net%2Fghost%2Fadmin-x-activitypub%400%2Fdist%2Fadmin-x-activitypub.js%22%7D" />
 
     <meta name="HandheldFriendly" content="True" />
     <meta name="MobileOptimized" content="320" />
@@ -37,7 +37,7 @@
     </style>
 
     <link integrity="" rel="stylesheet" href="assets/vendor-0ede59da8efb5e28fa929557f7ff7154.css">
-    <link integrity="" rel="stylesheet" href="assets/ghost-84fc705038c0ea946e4e5048ccb1fea5.css" title="light">
+    <link integrity="" rel="stylesheet" href="assets/ghost-5be0a663eecbd5db9c3612b90050fa66.css" title="light">
 
     
 </head>
@@ -58,7 +58,7 @@
 
     <script src="assets/vendor-88cd9f5cf5eba65221e2d2a636531eaa.js"></script>
 <script src="assets/chunk.874.5eb920d19e75683234c2.js"></script>
-<script src="assets/chunk.524.3ed488a4afaa8dc49de8.js"></script>
-    <script src="assets/ghost-7a6db87f125f7ea41beb7a88d500e8dc.js"></script>
+<script src="assets/chunk.524.85082593cb84282804e5.js"></script>
+    <script src="assets/ghost-fefa2e99b7dc389dfd6579049cdd2066.js"></script>
 </body>
 </html>

package/core/frontend/helpers/ghost_head.js

@@ -48,28 +48,31 @@ function finaliseStructuredData(meta) {
     return head;
 }
 
-function getMembersHelper(data, frontendKey) {
+function getMembersHelper(data, frontendKey, excludeList) {
     // Do not load Portal if both Memberships and Tips & Donations and Recommendations are disabled
     if (!settingsCache.get('members_enabled') && !settingsCache.get('donations_enabled') && !settingsCache.get('recommendations_enabled')) {
         return '';
     }
-
-    const {scriptUrl} = getFrontendAppConfig('portal');
-
-    const colorString = (_.has(data, 'site._preview') && data.site.accent_color) ? data.site.accent_color : '';
-    const attributes = {
-        i18n: labs.isSet('i18n'),
-        ghost: urlUtils.getSiteUrl(),
-        key: frontendKey,
-        api: urlUtils.urlFor('api', {type: 'content'}, true)
-    };
-    if (colorString) {
-        attributes['accent-color'] = colorString;
+    let membersHelper = '';
+    if (!excludeList.has('portal')) {
+        const {scriptUrl} = getFrontendAppConfig('portal');
+
+        const colorString = (_.has(data, 'site._preview') && data.site.accent_color) ? data.site.accent_color : '';
+        const attributes = {
+            i18n: labs.isSet('i18n'),
+            ghost: urlUtils.getSiteUrl(),
+            key: frontendKey,
+            api: urlUtils.urlFor('api', {type: 'content'}, true)
+        };
+        if (colorString) {
+            attributes['accent-color'] = colorString;
+        }
+        const dataAttributes = getDataAttributes(attributes);
+        membersHelper += `<script defer src="${scriptUrl}" ${dataAttributes} crossorigin="anonymous"></script>`;
+    }
+    if (!excludeList.has('cta_styles')) {
+        membersHelper += (`<style id="gh-members-styles">${templateStyles}</style>`);
     }
-    const dataAttributes = getDataAttributes(attributes);
-
-    let membersHelper = `<script defer src="${scriptUrl}" ${dataAttributes} crossorigin="anonymous"></script>`;
-    membersHelper += (`<style id="gh-members-styles">${templateStyles}</style>`);
     if (settingsCache.get('paid_members_enabled')) {
         // disable fraud detection for e2e tests to reduce waiting time
         const isFraudSignalsEnabled = process.env.NODE_ENV === 'testing-browser' ? '?advancedFraudSignals=false' : '';
@@ -91,7 +94,7 @@ function getSearchHelper(frontendKey) {
         key: frontendKey,
         styles: stylesUrl,
         'sodo-search': adminUrl,
-        locale: settingsCache.get('locale') || 'en'
+        locale: labs.isSet('i18n') ? (settingsCache.get('locale') || 'en') : undefined
     };
     const dataAttrs = getDataAttributes(attrs);
     let helper = `<script defer src="${scriptUrl}" ${dataAttrs} crossorigin="anonymous"></script>`;
@@ -198,12 +201,11 @@ function getTinybirdTrackerScript(dataRoot) {
 // We use the name ghost_head to match the helper for consistency:
 module.exports = async function ghost_head(options) { // eslint-disable-line camelcase
     debug('begin');
-
     // if server error page do nothing
     if (options.data.root.statusCode >= 500) {
         return;
     }
-
+    const excludeList = new Set(options?.hash?.exclude?.split(',') || []);
     const head = [];
     const dataRoot = options.data.root;
     const context = dataRoot._locals.context ? dataRoot._locals.context : null;
@@ -234,25 +236,26 @@ module.exports = async function ghost_head(options) { // eslint-disable-line cam
         debug('end fetch');
 
         if (context) {
-            // head is our main array that holds our meta data
-            if (meta.metaDescription && meta.metaDescription.length > 0) {
-                head.push('<meta name="description" content="' + escapeExpression(meta.metaDescription) + '">');
-            }
+            if (!excludeList.has('metadata')) {
+                // head is our main array that holds our meta data
+                if (meta.metaDescription && meta.metaDescription.length > 0) {
+                    head.push('<meta name="description" content="' + escapeExpression(meta.metaDescription) + '">');
+                }
 
-            // no output in head if a publication icon is not set
-            if (settingsCache.get('icon')) {
-                head.push('<link rel="icon" href="' + favicon + '" type="image/' + iconType + '">');
-            }
+                // no output in head if a publication icon is not set
+                if (settingsCache.get('icon')) {
+                    head.push('<link rel="icon" href="' + favicon + '" type="image/' + iconType + '">');
+                }
 
-            head.push('<link rel="canonical" href="' + escapeExpression(meta.canonicalUrl) + '">');
+                head.push('<link rel="canonical" href="' + escapeExpression(meta.canonicalUrl) + '">');
 
-            if (_.includes(context, 'preview')) {
-                head.push(writeMetaTag('robots', 'noindex,nofollow', 'name'));
-                head.push(writeMetaTag('referrer', 'same-origin', 'name'));
-            } else {
-                head.push(writeMetaTag('referrer', referrerPolicy, 'name'));
+                if (_.includes(context, 'preview')) {
+                    head.push(writeMetaTag('robots', 'noindex,nofollow', 'name'));
+                    head.push(writeMetaTag('referrer', 'same-origin', 'name'));
+                } else {
+                    head.push(writeMetaTag('referrer', referrerPolicy, 'name'));
+                }
             }
-
             // show amp link in post when 1. we are not on the amp page and 2. amp is enabled
             if (_.includes(context, 'post') && !_.includes(context, 'amp') && settingsCache.get('amp')) {
                 head.push('<link rel="amphtml" href="' +
@@ -270,30 +273,33 @@ module.exports = async function ghost_head(options) { // eslint-disable-line cam
             }
 
             if (!_.includes(context, 'paged') && useStructuredData) {
-                head.push('');
-                head.push.apply(head, finaliseStructuredData(meta));
-                head.push('');
+                if (!excludeList.has('social_data')) {
+                    head.push('');
+                    head.push.apply(head, finaliseStructuredData(meta));
+                    head.push('');
+                }
 
-                if (meta.schema) {
+                if (!excludeList.has('schema') && meta.schema) {
                     head.push('<script type="application/ld+json">\n' +
                         JSON.stringify(meta.schema, null, '    ') +
                         '\n    </script>\n');
                 }
             }
         }
-
         head.push('<meta name="generator" content="Ghost ' +
             escapeExpression(safeVersion) + '">');
-
         head.push('<link rel="alternate" type="application/rss+xml" title="' +
             escapeExpression(meta.site.title) + '" href="' +
             escapeExpression(meta.rssUrl) + '">');
-
         // no code injection for amp context!!!
         if (!_.includes(context, 'amp')) {
-            head.push(getMembersHelper(options.data, frontendKey));
-            head.push(getSearchHelper(frontendKey));
-            head.push(getAnnouncementBarHelper(options.data));
+            head.push(getMembersHelper(options.data, frontendKey, excludeList)); // controlling for excludes within the function
+            if (!excludeList.has('search')) {
+                head.push(getSearchHelper(frontendKey));
+            }
+            if (!excludeList.has('announcement')) {
+                head.push(getAnnouncementBarHelper(options.data));
+            }
             try {
                 head.push(getWebmentionDiscoveryLink());
             } catch (err) {
@@ -301,14 +307,17 @@ module.exports = async function ghost_head(options) { // eslint-disable-line cam
             }
 
             // @TODO do this in a more "frameworky" way
-            if (cardAssets.hasFile('js')) {
-                head.push(`<script defer src="${getAssetUrl('public/cards.min.js')}"></script>`);
-            }
-            if (cardAssets.hasFile('css')) {
-                head.push(`<link rel="stylesheet" type="text/css" href="${getAssetUrl('public/cards.min.css')}">`);
+
+            if (!excludeList.has('card_assets')) {
+                if (cardAssets.hasFile('js')) {
+                    head.push(`<script defer src="${getAssetUrl('public/cards.min.js')}"></script>`);
+                }
+                if (cardAssets.hasFile('css')) {
+                    head.push(`<link rel="stylesheet" type="text/css" href="${getAssetUrl('public/cards.min.css')}">`);
+                }
             }
 
-            if (settingsCache.get('comments_enabled') !== 'off') {
+            if (!excludeList.has('comment_counts') && settingsCache.get('comments_enabled') !== 'off') {
                 head.push(`<script defer src="${getAssetUrl('public/comment-counts.min.js')}" data-ghost-comments-counts-api="${urlUtils.getSiteUrl(true)}members/api/comments/counts/"></script>`);
             }
 
@@ -327,7 +336,6 @@ module.exports = async function ghost_head(options) { // eslint-disable-line cam
                     head.push(styleTag);
                 }
             }
-
             if (!_.isEmpty(globalCodeinjection)) {
                 head.push(globalCodeinjection);
             }

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

@@ -223,6 +223,7 @@
     align-items: center;
     height: 2.9em;
     min-height: 46px;
+    height: 100%;
     padding: 0 1.2em;
     outline: none;
     border: none;

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

@@ -9,6 +9,7 @@ module.exports = {
     emailFailures: require('./email-failures'),
     images: require('./images'),
     integrations: require('./integrations'),
+    oembed: require('./oembed'),
     pages: require('./pages'),
     posts: require('./posts'),
     settings: require('./settings'),

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

@@ -0,0 +1,5 @@
+const url = require('../utils/url');
+
+module.exports = (path) => {
+    return url.forImage(path);
+};

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

@@ -1,8 +1,15 @@
 const debug = require('@tryghost/debug')('api:endpoints:utils:serializers:output:oembed');
+const mappers = require('./mappers');
 
 module.exports = {
     all(data, apiConfig, frame) {
         debug('all');
+        if (data?.metadata?.thumbnail) {
+            data.metadata.thumbnail = mappers.oembed(data.metadata.thumbnail);
+        }
+        if (data?.metadata?.icon) {
+            data.metadata.icon = mappers.oembed(data.metadata.icon);
+        }
         frame.response = data;
     }
 };

package/core/server/services/email-service/EmailServiceWrapper.js

@@ -27,7 +27,7 @@ class EmailServiceWrapper {
         const limitService = require('../limits');
         const labs = require('../../../shared/labs');
         const emailAddressService = require('../email-address');
-
+        const i18nLib = require('@tryghost/i18n');
         const mobiledocLib = require('../../lib/mobiledoc');
         const lexicalLib = require('../../lib/lexical');
         const urlUtils = require('../../../shared/url-utils');
@@ -49,6 +49,8 @@ class EmailServiceWrapper {
         const mailgunClient = new MailgunClient({
             config: configService, settings: settingsCache
         });
+        const i18nLanguage = settingsCache.get('locale') || 'en';
+        const i18n = i18nLib(i18nLanguage, 'newsletter');
 
         const mailgunEmailProvider = new MailgunEmailProvider({
             mailgunClient,
@@ -73,7 +75,8 @@ class EmailServiceWrapper {
             outboundLinkTagger: memberAttribution.outboundLinkTagger,
             emailAddressService: emailAddressService.service,
             labs,
-            models: {Post}
+            models: {Post},
+            t: i18n.t
         });
 
         const sendingService = new SendingService({

package/core/server/services/i18n.js

@@ -33,4 +33,4 @@ module.exports.init = function () {
             i18nInstance.changeLanguage(model.get('value'));
         }
     });
-};
+};

package/core/server/services/oembed/TwitterOEmbedProvider.js

@@ -71,6 +71,14 @@ class TwitterOEmbedProvider {
                 oembedData.tweet_data = body.data;
                 oembedData.tweet_data.includes = body.includes;
             } catch (err) {
+                if (err.response?.body) {
+                    try {
+                        const parsed = JSON.parse(err.response.body);
+                        err.context = parsed;
+                    } catch (e) {
+                        err.context = err.response.body;
+                    }
+                }
                 logging.error(err);
             }
         }

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

@@ -1,8 +1,9 @@
 const config = require('../../../shared/config');
+const storage = require('../../adapters/storage');
 const externalRequest = require('../../lib/request-external');
 
 const OEmbed = require('@tryghost/oembed-service');
-const oembed = new OEmbed({config, externalRequest});
+const oembed = new OEmbed({config, externalRequest, storage});
 
 const NFT = require('./NFTOEmbedProvider');
 const nft = new NFT({

package/core/shared/config/defaults.json

@@ -197,12 +197,12 @@
     },
     "portal": {
         "url": "https://cdn.jsdelivr.net/ghost/portal@~{version}/umd/portal.min.js",
-        "version": "2.45"
+        "version": "2.46"
     },
     "sodoSearch": {
         "url": "https://cdn.jsdelivr.net/ghost/sodo-search@~{version}/umd/sodo-search.min.js",
         "styles": "https://cdn.jsdelivr.net/ghost/sodo-search@~{version}/umd/main.css",
-        "version": "1.4"
+        "version": "1.5"
     },
     "announcementBar": {
         "url": "https://cdn.jsdelivr.net/ghost/announcement-bar@~{version}/umd/announcement-bar.min.js",

package/core/shared/settings-cache/CacheManager.js

@@ -64,6 +64,10 @@ class CacheManager {
             return cacheEntry;
         }
 
+        // TODO: I think we should be a little smarter here and deserialize the value based on the type
+        //       rather than trying to parse everything as JSON, which is very slow when we do it hundreds
+        //       of times per request.
+
         // Default behavior is to try to resolve the value and return that
         try {
             // CASE: handle literal false
@@ -71,6 +75,11 @@ class CacheManager {
                 return false;
             }
 
+            // CASE: hotpath early return for strings which are already strings
+            if (cacheEntry.type === 'string' && typeof cacheEntry.value === 'string') {
+                return cacheEntry.value || null;
+            }
+
             // CASE: if a string contains a number e.g. "1", JSON.parse will auto convert into integer
             if (!isNaN(Number(cacheEntry.value))) {
                 return cacheEntry.value || null;