ghost 5.68.0 → 5.69.1

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.68%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%22ad022e25eb%22%2C%22adminXSettingsFilename%22%3A%22admin-x-settings.js%22%2C%22adminXSettingsHash%22%3A%2203b15b5c6c%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.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%22efb1df78c0%22%2C%22adminXSettingsFilename%22%3A%22admin-x-settings.js%22%2C%22adminXSettingsHash%22%3A%22144e5858ba%22%7D" />
 
     <meta name="HandheldFriendly" content="True" />
     <meta name="MobileOptimized" content="320" />
@@ -36,8 +36,8 @@
         }
     </style>
 
-    <link integrity="" rel="stylesheet" href="assets/vendor-3e6947aa681f0fb82b193090e520dc73.css">
-    <link integrity="" rel="stylesheet" href="assets/ghost-04f331b095bb184b7ee00f43f65466e4.css" title="light">
+    <link integrity="" rel="stylesheet" href="assets/vendor-0ede59da8efb5e28fa929557f7ff7154.css">
+    <link integrity="" rel="stylesheet" href="assets/ghost-de20b1dc1f76d9dd196738a479610681.css" title="light">
 
     
 </head>
@@ -56,9 +56,9 @@
 
     <div id="ember-basic-dropdown-wormhole"></div>
 
-    <script src="assets/vendor-71d23939faaa5d1478ead73d917111b9.js"></script>
-<script src="assets/chunk.940.f55d8073f4fd2738aa11.js"></script>
-<script src="assets/chunk.143.5770521695d411ee098e.js"></script>
-    <script src="assets/ghost-fb0f793a8d8d9df304bc501fbcad01e4.js"></script>
+    <script src="assets/vendor-d4aa86641c6080ce3bc58e6d54252774.js"></script>
+<script src="assets/chunk.649.1ce887e24e7688045296.js"></script>
+<script src="assets/chunk.143.5515dcb02de04c657261.js"></script>
+    <script src="assets/ghost-831787c0c608f25507fb45807b60374c.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/tpl/recommendations.hbs

@@ -3,9 +3,10 @@
         {{#each recommendations as |rec|}}
         <li class="recommendation">
             <a href="{{rec.url}}" data-recommendation="{{rec.id}}" target="_blank" rel="noopener">
-                <img class="recommendation-favicon" src="{{rec.favicon}}" alt="{{rec.title}}">
+                <img class="recommendation-favicon" src="{{rec.favicon}}" alt="{{rec.title}}" loading="lazy">
                 <h5 class="recommendation-title">{{rec.title}}</h5>
-                <p class="recommendation-reason">{{rec.reason}}</p>
+                <span class="recommendation-url">{{readable_url rec.url}}</span>
+                <p class="recommendation-description">{{rec.description}}</p>
             </a>
         </li>
         {{/each}}

package/core/server/api/endpoints/utils/serializers/input/pages.js

@@ -26,7 +26,7 @@ function defaultRelations(frame) {
         return false;
     }
 
-    frame.options.withRelated = ['tags', 'authors', 'authors.roles', 'tiers', 'count.signups', 'count.paid_conversions', 'post_revisions', 'post_revisions.author'];
+    frame.options.withRelated = ['tags', 'authors', 'authors.roles', 'tiers', 'count.signups', 'count.paid_conversions'];
 }
 
 function setDefaultOrder(frame) {

package/core/server/api/endpoints/utils/serializers/input/posts.js

@@ -43,7 +43,7 @@ function defaultRelations(frame) {
         return false;
     }
 
-    frame.options.withRelated = ['tags', 'authors', 'authors.roles', 'email', 'tiers', 'newsletter', 'count.clicks', 'post_revisions', 'post_revisions.author'];
+    frame.options.withRelated = ['tags', 'authors', 'authors.roles', 'email', 'tiers', 'newsletter', 'count.clicks'];
 }
 
 function setDefaultOrder(frame) {

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/member.js

@@ -373,8 +373,10 @@ const Member = ghostBookshelf.Model.extend({
     },
 
     searchQuery: function searchQuery(queryBuilder, query) {
-        queryBuilder.where('members.name', 'like', `%${query}%`);
-        queryBuilder.orWhere('members.email', 'like', `%${query}%`);
+        queryBuilder.where(function () {
+            this.where('members.name', 'like', `%${query}%`)
+                .orWhere('members.email', 'like', `%${query}%`);
+        });
     },
 
     orderRawQuery(field, direction) {

package/core/server/services/lexical-multiplayer/service.js

@@ -93,7 +93,7 @@ module.exports = {
 
         _disable = async () => {
             logging.info('Stopping lexical multiplayer websockets service');
-            ghostServer.httpServer.off('upgrade', handleUpgrade);
+            ghostServer.httpServer?.off('upgrade', handleUpgrade);
 
             if (wss) {
                 _isClosing = true;

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/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/shared/labs.js

@@ -37,7 +37,6 @@ const ALPHA_FEATURES = [
     'websockets',
     'stripeAutomaticTax',
     'emailCustomization',
-    'adminXSettings',
     'mailEvents',
     'collectionsCard',
     'tipsAndDonations',