ghost 5.67.0 → 5.69.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.67%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%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.69%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%2C%22editorFilename%22%3A%22koenig-lexical.umd.js%22%2C%22editorHash%22%3A%22a38c847eaf%22%2C%22adminXSettingsFilename%22%3A%22admin-x-settings.js%22%2C%22adminXSettingsHash%22%3A%226c3c017a49%22%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-9e454659c8c0896ed10336b640d1b1eb.css" title="light">
+    <link integrity="" rel="stylesheet" href="assets/ghost-a1d3bcea0bd360af258a27e29323ba35.css" title="light">
 
     
 </head>
@@ -57,8 +57,8 @@
     <div id="ember-basic-dropdown-wormhole"></div>
 
     <script src="assets/vendor-71d23939faaa5d1478ead73d917111b9.js"></script>
-<script src="assets/chunk.940.b09a2c2049ed9c373dd0.js"></script>
-<script src="assets/chunk.143.da2301d9edb6ad0b5496.js"></script>
-    <script src="assets/ghost-193c98abe66483968da753e54917e87a.js"></script>
+<script src="assets/chunk.940.159ed6caf77114942465.js"></script>
+<script src="assets/chunk.143.6e2a218178c3c44fac33.js"></script>
+    <script src="assets/ghost-a012143b70f1e3bffed74252f7a736df.js"></script>
 </body>
 </html>

package/core/frontend/helpers/img_url.js

@@ -54,7 +54,7 @@ module.exports = function imgUrl(requestedImageUrl, options) {
                 // ignore errors and just return the original URL
             }
         }
-        
+
         return requestedImageUrl;
     }
 
@@ -117,7 +117,7 @@ function getUnsplashImage(imagePath, sizeOptions) {
     const parsedUrl = new URL(imagePath);
     const {requestedSize, imageSizes, requestedFormat} = sizeOptions;
 
-    if (requestedFormat) {        
+    if (requestedFormat) {
         const supportedFormats = ['avif', 'gif', 'jpg', 'png', 'webp'];
         if (supportedFormats.includes(requestedFormat)) {
             parsedUrl.searchParams.set('fm', requestedFormat);
@@ -150,13 +150,13 @@ function getUnsplashImage(imagePath, sizeOptions) {
 }
 
 /**
- * 
- * @param {string} imagePath 
- * @param {Object} sizeOptions 
+ *
+ * @param {string} imagePath
+ * @param {Object} sizeOptions
  * @param {string} sizeOptions.requestedSize
  * @param {Object[]} sizeOptions.imageSizes
  * @param {string} [sizeOptions.requestedFormat]
- * @returns 
+ * @returns
  */
 function getImageWithSize(imagePath, sizeOptions) {
     const hasLeadingSlash = imagePath[0] === '/';

package/core/frontend/helpers/readable_url.js

@@ -0,0 +1,32 @@
+// # Readable URL helper
+// Usage: `{{readable_url "https://google.com"}}`
+//
+// Returns a human readable URL for the given URL, e.g. google.com for https://www.google.com?query=1#section
+
+const logging = require('@tryghost/logging');
+const sentry = require('../../shared/sentry');
+const errors = require('@tryghost/errors');
+const {SafeString} = require('../services/handlebars');
+
+function captureError(message) {
+    const error = new errors.IncorrectUsageError({message});
+    sentry.captureException(error);
+    logging.error(error);
+}
+
+module.exports = function readableUrl(inputUrl) {
+    if (!inputUrl || typeof inputUrl !== 'string') {
+        captureError(`Expected a string, received ${inputUrl}.`);
+        return new SafeString('');
+    }
+
+    try {
+        const url = new URL(inputUrl);
+        const readable = url.hostname.replace(/^www\./, '') + url.pathname.replace(/\/$/, '');
+
+        return new SafeString(readable);
+    } catch (e) {
+        captureError(`The string "${inputUrl}" could not be parsed as URL.`);
+        return new SafeString(inputUrl);
+    }
+};

package/core/frontend/helpers/recommendations.js

@@ -63,7 +63,7 @@ async function fetchRecommendations(apiOptions) {
  */
 function parseOptions(options) {
     let limit = options.limit ?? 5;
-    let order = options.order ?? 'createdAt desc';
+    let order = options.order ?? 'created_at desc';
     let filter = options.filter ?? '';
     let page = options.page ?? 1;
 

package/core/frontend/helpers/tpl/recommendations.hbs

@@ -2,12 +2,11 @@
     <ul class="recommendations">
         {{#each recommendations as |rec|}}
         <li class="recommendation">
-            <a href="{{rec.url}}">
+            <a href="{{rec.url}}" data-recommendation="{{rec.id}}" target="_blank" rel="noopener">
                 <img class="recommendation-favicon" src="{{rec.favicon}}" alt="{{rec.title}}">
-                <div class="recommendation-content">
-                    <h5 class="recommendation-title">{{rec.title}}</h5>
-                    <p class="recommendation-reason">{{rec.reason}}</p>
-                </div>
+                <span class="recommendation-url">{{readable_url rec.url}}</span>
+                <h5 class="recommendation-title">{{rec.title}}</h5>
+                <p class="recommendation-description">{{rec.description}}</p>
             </a>
         </li>
         {{/each}}

package/core/server/GhostServer.js

@@ -4,6 +4,7 @@ const debug = require('@tryghost/debug')('server');
 const errors = require('@tryghost/errors');
 const tpl = require('@tryghost/tpl');
 const logging = require('@tryghost/logging');
+const metrics = require('@tryghost/metrics');
 const notify = require('./notify');
 const moment = require('moment');
 const stoppable = require('stoppable');
@@ -169,8 +170,16 @@ class GhostServer {
         try {
             // If we never fully started, there's nothing to stop
             if (this.httpServer && this.httpServer.listening) {
+                // Time how long it takes to close all in-flight requests
+                const startTime = Date.now();
+
                 // We stop the server first so that no new long running requests or processes can be started
                 await this._stopServer();
+
+                const shutdownDuration = Date.now() - startTime;
+                if (shutdownDuration > 15000) {
+                    metrics.metric('long-shutdown', shutdownDuration);
+                }
             }
             // Do all of the cleanup tasks
             await this._cleanup();

package/core/server/api/endpoints/incoming-recommendations.js

@@ -0,0 +1,20 @@
+const recommendations = require('../../services/recommendations');
+
+module.exports = {
+    docName: 'recommendations',
+
+    browse: {
+        headers: {
+            cacheInvalidate: false
+        },
+        options: [
+            'limit',
+            'page'
+        ],
+        permissions: true,
+        validation: {},
+        async query(frame) {
+            return await recommendations.incomingRecommendationController.browse(frame);
+        }
+    }
+};

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

@@ -209,6 +209,10 @@ module.exports = {
         return apiFramework.pipeline(require('./recommendations'), localUtils);
     },
 
+    get incomingRecommendations() {
+        return apiFramework.pipeline(require('./incoming-recommendations'), localUtils);
+    },
+
     /**
      * Content API Controllers
      *

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

@@ -26,8 +26,9 @@ const rejectPrivateFieldsTransformer = input => mapQuery(input, function (value,
 function generateOptionsData(frame, options) {
     return options.reduce((memo, option) => {
         let value = frame.options?.[option];
-        if (['include', 'fields', 'formats'].includes(option)) {
-            value = value?.split(',').sort();
+
+        if (['include', 'fields', 'formats'].includes(option) && typeof value === 'string') {
+            value = value.split(',').sort();
         }
 
         if (option === 'page') {

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

@@ -19,7 +19,6 @@ module.exports = {
             'emailAnalytics',
             'hostSettings',
             'tenor',
-            'editor',
             'pintura',
             'signupForm'
         ];

package/core/server/data/migrations/utils/schema.js

@@ -91,7 +91,35 @@ function createSetNullableMigration(table, column, options = {}) {
                 if (options.disableForeignKeyChecks) {
                     await knex.raw('SET FOREIGN_KEY_CHECKS=1;').transacting(knex);
                 }
-            }            
+            }
+        }
+    );
+}
+
+/**
+ * @param {string} table
+ * @param {string} from
+ * @param {string} to
+ *
+ * @returns {Migration}
+ */
+function createRenameColumnMigration(table, from, to) {
+    return createNonTransactionalMigration(
+        async function up(knex) {
+            const hasColumn = await knex.schema.hasColumn(table, to);
+            if (hasColumn) {
+                logging.warn(`Renaming ${table}.${from} to ${table}.${to} column - skipping as column ${table}.${to} already exists`);
+            } else {
+                await commands.renameColumn(table, from, to, knex);
+            }
+        },
+        async function down(knex) {
+            const hasColumn = await knex.schema.hasColumn(table, from);
+            if (hasColumn) {
+                logging.warn(`Renaming ${table}.${to} to ${table}.${from} column - skipping as column ${table}.${from} already exists`);
+            } else {
+                await commands.renameColumn(table, to, from, knex);
+            }
         }
     );
 }
@@ -134,7 +162,8 @@ module.exports = {
     createAddColumnMigration,
     createDropColumnMigration,
     createSetNullableMigration,
-    createDropNullableMigration
+    createDropNullableMigration,
+    createRenameColumnMigration
 };
 
 /**

package/core/server/data/migrations/versions/5.69/2023-10-06-15-06-00-rename-recommendations-reason-to-description.js

@@ -0,0 +1,3 @@
+const {createRenameColumnMigration} = require('../../utils');
+
+module.exports = createRenameColumnMigration('recommendations', 'reason', 'description');

package/core/server/data/schema/commands.js

@@ -156,6 +156,25 @@ async function dropColumn(tableName, column, transaction = db.knex, columnSpec =
     }
 }
 
+/**
+ * @param {string} tableName
+ * @param {string} from
+ * @param {string} to
+ * @param {import('knex').Knex.Transaction} [transaction]
+ */
+async function renameColumn(tableName, from, to, transaction = db.knex) {
+    logging.info(`Renaming column '${from}' to '${to}' in table '${tableName}'`);
+
+    if (DatabaseInfo.isMySQL(transaction)) {
+        // The knex helper does a lot of interesting things with foreign keys that are slow on bigger MySQL clusters
+        return await transaction.raw(`ALTER TABLE \`${tableName}\` RENAME COLUMN \`${from}\` TO \`${to}\`;`);
+    }
+
+    return await transaction.schema.table(tableName, function (table) {
+        table.renameColumn(from, to);
+    });
+}
+
 /**
  * Adds an unique index to a table over the given columns.
  *
@@ -520,6 +539,7 @@ module.exports = {
     addForeign,
     dropForeign,
     addColumn,
+    renameColumn,
     dropColumn,
     setNullable,
     dropNullable,

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

@@ -1076,7 +1076,7 @@ module.exports = {
         excerpt: {type: 'string', maxlength: 2000, nullable: true},
         featured_image: {type: 'string', maxlength: 2000, nullable: true},
         favicon: {type: 'string', maxlength: 2000, nullable: true},
-        reason: {type: 'string', maxlength: 2000, nullable: true},
+        description: {type: 'string', maxlength: 2000, nullable: true},
         one_click_subscribe: {type: 'boolean', nullable: false, defaultTo: false},
         created_at: {type: 'dateTime', nullable: false},
         updated_at: {type: 'dateTime', nullable: true}

package/core/server/models/product.js

@@ -82,7 +82,7 @@ const Product = ghostBookshelf.Model.extend({
                 return benefitToSave.name.toLowerCase() === existingBenefit.get('name').toLowerCase();
             });
             if (existingBenefitModel) {
-                benefitToSave.name = existingBenefitModel.get('name');
+                benefitToSave.id = existingBenefitModel.id;
             }
         });
 

package/core/server/services/newsletters/NewslettersService.js

@@ -199,7 +199,7 @@ class NewslettersService {
         }
 
         let updatedNewsletter;
-        
+
         try {
             updatedNewsletter = await this.NewsletterModel.edit(cleanedAttrs, options);
         } catch (error) {
@@ -215,7 +215,7 @@ class NewslettersService {
 
         // Load relations correctly in the response
         updatedNewsletter = await this.NewsletterModel.findOne({id: updatedNewsletter.id}, {...options, require: true});
-        
+
         await this.respondWithEmailVerification(updatedNewsletter, emailsToVerify);
         return updatedNewsletter;
     }

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

@@ -23,7 +23,7 @@ class TwitterOEmbedProvider {
      * @returns {Promise<boolean>}
      */
     async canSupportRequest(url) {
-        return url.host === 'twitter.com' && TWITTER_PATH_REGEX.test(url.pathname);
+        return (url.host === 'twitter.com' || url.host === 'x.com') && TWITTER_PATH_REGEX.test(url.pathname);
     }
 
     /**
@@ -33,6 +33,10 @@ class TwitterOEmbedProvider {
      * @returns {Promise<object>}
      */
     async getOEmbedData(url, externalRequest) {
+        if (url.host === 'x.com') { // api is still at twitter.com... also not certain how people are getting x urls because twitter currently redirects every x host to twitter
+            url = new URL('https://twitter.com' + url.pathname);
+        }
+
         const [match, tweetId] = url.pathname.match(TWITTER_PATH_REGEX);
         if (!match) {
             return null;

package/core/server/services/recommendations/RecommendationServiceWrapper.js

@@ -28,6 +28,11 @@ class RecommendationServiceWrapper {
      */
     service;
 
+    /**
+     * @type {import('@tryghost/recommendations').IncomingRecommendationController}
+     */
+    incomingRecommendationController;
+
     /**
      * @type {import('@tryghost/recommendations').IncomingRecommendationService}
      */
@@ -51,6 +56,7 @@ class RecommendationServiceWrapper {
             RecommendationController,
             WellknownService,
             BookshelfClickEventRepository,
+            IncomingRecommendationController,
             IncomingRecommendationService,
             IncomingRecommendationEmailRenderer
         } = require('@tryghost/recommendations');
@@ -125,6 +131,10 @@ class RecommendationServiceWrapper {
             service: this.service
         });
 
+        this.incomingRecommendationController = new IncomingRecommendationController({
+            service: this.incomingRecommendationService
+        });
+
         if (labs.isSet('recommendations')) {
             this.service.init().catch(logging.error);
             this.incomingRecommendationService.init().catch(logging.error);

package/core/server/services/settings/SettingsBREADService.js

@@ -65,11 +65,7 @@ class SettingsBREADService {
                 // @todo: need to make this more generic?
                 const adminUrl = urlUtils.urlFor('admin', true);
                 const signinURL = new URL(adminUrl);
-                signinURL.hash = `/settings/members/?verifyEmail=${token}`;
-                // NOTE: to be removed in future, this is to ensure that the new settings are used when enabled
-                if (labsService && labsService.isSet('adminXSettings')) {
-                    signinURL.hash = `/settings-x/portal/edit?verifyEmail=${token}`;
-                }
+                signinURL.hash = `/settings/portal/edit?verifyEmail=${token}`;
 
                 return signinURL.href;
             }

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

@@ -354,5 +354,8 @@ module.exports = function apiRoutes() {
     router.put('/recommendations/:id', mw.authAdminApi, http(api.recommendations.edit));
     router.del('/recommendations/:id', mw.authAdminApi, http(api.recommendations.destroy));
 
+    // Incoming recommendations
+    router.get('/incoming_recommendations', mw.authAdminApi, http(api.incomingRecommendations.browse));
+
     return router;
 };

package/core/shared/config/defaults.json

@@ -197,10 +197,6 @@
         "url": "https://cdn.jsdelivr.net/ghost/comments-ui@~{version}/umd/comments-ui.min.js",
         "version": "0.13"
     },
-    "editor": {
-        "url": "https://cdn.jsdelivr.net/ghost/koenig-lexical@~{version}/dist/koenig-lexical.umd.js",
-        "version": "0.4"
-    },
     "signupForm": {
         "url": "https://cdn.jsdelivr.net/ghost/signup-form@~{version}/umd/signup-form.min.js",
         "version": "0.1"

package/core/shared/labs.js

@@ -19,7 +19,8 @@ const GA_FEATURES = [
     'themeErrorsNotification',
     'outboundLinkTagging',
     'announcementBar',
-    'signupForm'
+    'signupForm',
+    'lexicalEditor'
 ];
 
 // NOTE: this allowlist is meant to be used to filter out any unexpected
@@ -27,8 +28,7 @@ const GA_FEATURES = [
 const BETA_FEATURES = [
     'i18n',
     'activitypub',
-    'webmentions',
-    'lexicalEditor'
+    'webmentions'
 ];
 
 const ALPHA_FEATURES = [
@@ -37,7 +37,6 @@ const ALPHA_FEATURES = [
     'websockets',
     'stripeAutomaticTax',
     'emailCustomization',
-    'adminXSettings',
     'mailEvents',
     'collectionsCard',
     'tipsAndDonations',