ghost 6.53.0 → 6.54.0

package/core/server/data/migrations/versions/6.54/2026-07-23-10-24-18-add-automation-action-revision-to-redirects.js

@@ -0,0 +1,9 @@
+const {createAddColumnMigration} = require('../../utils');
+
+module.exports = createAddColumnMigration('redirects', 'automation_action_revision_id', {
+    type: 'string',
+    maxlength: 24,
+    nullable: true,
+    references: 'automation_action_revisions.id',
+    setNullDelete: true
+}, {algorithm: 'auto'});

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

@@ -5,6 +5,7 @@ const tpl = require('@tryghost/tpl');
 const db = require('../db');
 const DatabaseInfo = require('@tryghost/database-info');
 const schema = require('./schema');
+const {defaultIndexName} = require('./lib/default-index-name');
 
 const messages = {
     hasPrimaryKeySQLiteError: 'Must use hasPrimaryKeySQLite on an SQLite3 database',
@@ -191,19 +192,38 @@ async function renameColumn(tableName, from, to, transaction = db.knex) {
     });
 }
 
+/**
+ * Builds the column arguments for a MySQL index prefix, such as `col(123)`.
+ *
+ * @param {import('knex').Knex} knex
+ * @param {string|string[]} columns
+ * @param {number} length
+ * @returns {import('knex').Knex.Raw[]}
+ */
+function prefixIndexColumns(knex, columns, length) {
+    return (Array.isArray(columns) ? columns : [columns])
+        .map(col => knex.raw('?? (?)', [col, length]));
+}
+
 /**
  * Adds an non-unique index to a table over the given columns.
  *
  * @param {string} tableName - name of the table to add indexes to
  * @param {string|string[]} columns - column(s) to add indexes for
  * @param {import('knex').Knex} [transaction] - connection object containing knex reference
+ * @param {object} [options]
+ * @param {number} [options.length] - MySQL only: create a prefix index of this many characters
  */
-async function addIndex(tableName, columns, transaction = db.knex) {
+async function addIndex(tableName, columns, transaction = db.knex, options = {}) {
     try {
         logging.info(`Adding index for '${columns}' in table '${tableName}'`);
 
         return await transaction.schema.table(tableName, function (table) {
-            table.index(columns);
+            if (options.length && DatabaseInfo.isMySQL(transaction)) {
+                table.index(prefixIndexColumns(transaction, columns, options.length), defaultIndexName(tableName, columns));
+            } else {
+                table.index(columns);
+            }
         });
     } catch (err) {
         if (err.code === 'SQLITE_ERROR') {
@@ -500,7 +520,21 @@ function createTable(table, transaction = db.knex, tableSpec = schema[table]) {
             .forEach(column => addTableColumn(table, t, column, tableSpec[column]));
 
         if (tableSpec['@@INDEXES@@']) {
-            tableSpec['@@INDEXES@@'].forEach(index => t.index(index));
+            tableSpec['@@INDEXES@@'].forEach((index) => {
+                if (index && typeof index === 'object' && !Array.isArray(index)) {
+                    if (index.length && DatabaseInfo.isMySQL(transaction)) {
+                        t.index(
+                            prefixIndexColumns(transaction, index.columns, index.length),
+                            defaultIndexName(table, index.columns)
+                        );
+                    } else {
+                        // SQLite doesn't support prefix indexes, so we index the whole thing.
+                        t.index(index.columns);
+                    }
+                } else {
+                    t.index(index);
+                }
+            });
         }
         if (tableSpec['@@UNIQUE_CONSTRAINTS@@']) {
             tableSpec['@@UNIQUE_CONSTRAINTS@@'].forEach(unique => t.unique(unique));

package/core/server/data/schema/fixtures/fixtures.json

@@ -144,6 +144,11 @@
                     "action_type": "deleteAllContent",
                     "object_type": "db"
                 },
+                {
+                    "name": "Import content",
+                    "action_type": "importContent",
+                    "object_type": "content_import"
+                },
                 {
                     "name": "Send mail",
                     "action_type": "send",
@@ -966,6 +971,7 @@
             "entries": {
                 "Administrator": {
                     "db": "all",
+                    "content_import": "all",
                     "mail": "all",
                     "notification": "all",
                     "post": "all",
@@ -1020,6 +1026,7 @@
                 },
                 "Self-Serve Migration Integration": {
                     "db": "importContent",
+                    "content_import": "importContent",
                     "member": "add",
                     "tag": "read"
                 },

package/core/server/data/schema/lib/default-index-name.js

@@ -0,0 +1,20 @@
+/**
+ * Normally, we use Knex for index names. But in some cases, we need to derive
+ * them because Knex won't get it right. We try to match [Knex's code][0] as
+ * closely as possible.
+ *
+ * [0]: https://github.com/knex/knex/blob/e25d54bcb707714a17f5a5744eba5c4246bb4d1d/lib/schema/tablecompiler.js#L401-L415
+ *
+ * @param {string} tableName
+ * @param {string|string[]} columns
+ * @returns {string}
+ */
+function defaultIndexName(tableName, columns) {
+    if (!Array.isArray(columns)) {
+        columns = columns ? [columns] : [];
+    }
+    const table = tableName.replace(/\.|-/g, '_');
+    return (table + '_' + columns.join('_') + '_index').toLowerCase();
+}
+
+exports.defaultIndexName = defaultIndexName;

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

@@ -1076,20 +1076,6 @@ module.exports = {
         metadata: {type: 'string', maxlength: 2000, nullable: true},
         queue_entry: {type: 'integer', nullable: true, unsigned: true}
     },
-    redirects: {
-        id: {type: 'string', maxlength: 24, nullable: false, primary: true},
-        from: {type: 'string', maxlength: 191, nullable: false, index: true},
-        to: {type: 'string', maxlength: 2000, nullable: false},
-        post_id: {type: 'string', maxlength: 24, nullable: true, unique: false, references: 'posts.id', setNullDelete: true},
-        created_at: {type: 'dateTime', nullable: false},
-        updated_at: {type: 'dateTime', nullable: true}
-    },
-    members_click_events: {
-        id: {type: 'string', maxlength: 24, nullable: false, primary: true},
-        member_id: {type: 'string', maxlength: 24, nullable: false, references: 'members.id', cascadeDelete: true},
-        redirect_id: {type: 'string', maxlength: 24, nullable: false, references: 'redirects.id', cascadeDelete: true},
-        created_at: {type: 'dateTime', nullable: false}
-    },
     members_feedback: {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},
         score: {type: 'integer', nullable: false, unsigned: true, defaultTo: 0},
@@ -1265,12 +1251,27 @@ module.exports = {
         email_lexical: {type: 'text', maxlength: 1000000000, fieldtype: 'long', nullable: true},
         email_design_setting_id: {type: 'string', maxlength: 24, nullable: true, references: 'email_design_settings.id', setNullDelete: true},
         email_sent_count: {type: 'integer', nullable: true, unsigned: true},
-        email_tracked_sent_count: {type: 'integer', nullable: true, unsigned: true},
         email_opened_count: {type: 'integer', nullable: true, unsigned: true},
+        email_clicked_count: {type: 'integer', nullable: true, unsigned: true},
         '@@UNIQUE_CONSTRAINTS@@': [
             ['created_at', 'action_id']
         ]
     },
+    redirects: {
+        id: {type: 'string', maxlength: 24, nullable: false, primary: true},
+        from: {type: 'string', maxlength: 191, nullable: false, index: true},
+        to: {type: 'string', maxlength: 2000, nullable: false},
+        post_id: {type: 'string', maxlength: 24, nullable: true, unique: false, references: 'posts.id', setNullDelete: true},
+        automation_action_revision_id: {type: 'string', maxlength: 24, nullable: true, references: 'automation_action_revisions.id', setNullDelete: true},
+        created_at: {type: 'dateTime', nullable: false},
+        updated_at: {type: 'dateTime', nullable: true}
+    },
+    members_click_events: {
+        id: {type: 'string', maxlength: 24, nullable: false, primary: true},
+        member_id: {type: 'string', maxlength: 24, nullable: false, references: 'members.id', cascadeDelete: true},
+        redirect_id: {type: 'string', maxlength: 24, nullable: false, references: 'redirects.id', cascadeDelete: true},
+        created_at: {type: 'dateTime', nullable: false}
+    },
     automation_action_edges: {
         source_action_id: {type: 'string', maxlength: 24, nullable: false, references: 'automation_actions.id', restrictDelete: true},
         target_action_id: {type: 'string', maxlength: 24, nullable: false, references: 'automation_actions.id', restrictDelete: true},
@@ -1296,7 +1297,10 @@ module.exports = {
         finished_at: {type: 'dateTime', nullable: true},
         status: {type: 'string', maxlength: 50, nullable: false, defaultTo: 'pending', validations: {isIn: [['pending', 'automation disabled', 'failed', 'finished', 'member changed status', 'member unsubscribed']]}},
         locked_by: {type: 'string', maxlength: 191, nullable: true},
-        locked_at: {type: 'dateTime', nullable: true}
+        locked_at: {type: 'dateTime', nullable: true},
+        '@@INDEXES@@': [
+            ['status', 'ready_at', 'created_at', 'id']
+        ]
     },
     welcome_email_automated_emails: {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},
@@ -1338,9 +1342,28 @@ module.exports = {
         mailgun_message_id: {type: 'string', maxlength: 1000, nullable: true},
         delivered_at: {type: 'dateTime', nullable: true},
         opened_at: {type: 'dateTime', nullable: true},
+        clicked_at: {type: 'dateTime', nullable: true},
         track_opens: {type: 'boolean', nullable: false, defaultTo: false},
+        track_clicks: {type: 'boolean', nullable: false, defaultTo: false},
         created_at: {type: 'dateTime', nullable: false},
-        updated_at: {type: 'dateTime', nullable: true}
+        updated_at: {type: 'dateTime', nullable: true},
+        '@@INDEXES@@': [
+            // `mailgun_message_id` is too long for a MySQL index, so we use a
+            // prefix.
+            //
+            // We choose 31 because Mailgun message IDs look like this:
+            //
+            //     20200420080647.ab01cd02ef03ba04@mailgun.domain.example
+            //     YYYYMMDDHHMMSS.RANDOM-HEX-BYTES@DOMAIN
+            //
+            // That first part is unlikely to have conflicts, so let's use
+            // that. This index is for performance, not uniqueness, so it's
+            // okay if there's a conflict.
+            //
+            // Note that this prefix index only happens for MySQL. SQLite
+            // indexes the full value.
+            {columns: ['mailgun_message_id'], length: 31}
+        ]
     },
     gifts: {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},

package/core/server/data/seeders/data-generator.js

@@ -59,8 +59,10 @@ class DataGenerator {
             table.dependencies = Object.entries(this.schemaTables[table.name]).reduce((acc, [_col, data]) => {
                 if (data.references) {
                     const referencedTable = data.references.split('.')[0];
-                    // The ghost_subscriptions_id property has a foreign key to the subscriptions table, but we don't use that table yet atm, so don't add it as a dependency
-                    if (!acc.includes(referencedTable) && referencedTable !== 'subscriptions') {
+                    // Some nullable relationships point to tables the generator does not populate.
+                    // Generated redirects belong to posts, so automation revisions are not a seed dependency.
+                    const isUnsupportedOptionalDependency = referencedTable === 'subscriptions' || (referencedTable === 'automation_action_revisions' && data.nullable);
+                    if (!acc.includes(referencedTable) && !isUnsupportedOptionalDependency) {
                         acc.push(referencedTable);
                     }
                 }

package/core/server/lib/image/image-size.js

@@ -17,9 +17,9 @@ const FETCH_ONLY_FORMATS = [
 ];
 
 class ImageSize {
-    constructor({config, storage, storageUtils, validator, urlUtils, request, probe}) {
+    constructor({config, imageStore, storageUtils, validator, urlUtils, request, probe}) {
         this.config = config;
-        this.storage = storage;
+        this.imageStore = imageStore;
         this.storageUtils = storageUtils;
         this.validator = validator;
         this.urlUtils = urlUtils;
@@ -248,8 +248,7 @@ class ImageSize {
         // get the storage readable filePath
         filePath = this.storageUtils.getLocalImagesStoragePath(imagePath);
 
-        return this.storage.getStorage('images')
-            .read({path: filePath})
+        return this.imageStore.read({path: filePath})
             .then((buf) => {
                 debug('Image fetched (storage):', filePath);
                 return this._imageSizeFromBuffer(buf);
@@ -298,10 +297,9 @@ class ImageSize {
      */
     async getOriginalImagePath(imagePath) {
         const {dir, name, ext} = path.parse(imagePath);
-        const storageInstance = this.storage.getStorage('images');
 
         const preferredUnoptimizedImagePath = path.join(dir, `${name}_o${ext}`);
-        const preferredUnoptimizedImagePathExists = await storageInstance.exists(preferredUnoptimizedImagePath);
+        const preferredUnoptimizedImagePathExists = await this.imageStore.exists(preferredUnoptimizedImagePath);
         if (preferredUnoptimizedImagePathExists) {
             return preferredUnoptimizedImagePath;
         }
@@ -315,7 +313,7 @@ class ImageSize {
         }
 
         const legacyOriginalImagePath = path.join(dir, `${imageName}_o${imageNumber || ''}${ext}`);
-        const legacyOriginalImageExists = await storageInstance.exists(legacyOriginalImagePath);
+        const legacyOriginalImageExists = await this.imageStore.exists(legacyOriginalImagePath);
 
         return legacyOriginalImageExists ? legacyOriginalImagePath : imagePath;
     }

package/core/server/lib/image/image-utils.js

@@ -25,9 +25,9 @@ function probe(url, options = {}, {probeImageSize: probeImageSizeFn = probeImage
 }
 
 class ImageUtils {
-    constructor({config, urlUtils, settingsCache, storageUtils, storage, validator, request, cacheStore}) {
+    constructor({config, urlUtils, settingsCache, storageUtils, imageStore, validator, request, cacheStore}) {
         this.blogIcon = new BlogIcon({config, urlUtils, settingsCache, storageUtils});
-        this.imageSize = new ImageSize({config, storage, storageUtils, validator, urlUtils, request, probe});
+        this.imageSize = new ImageSize({config, imageStore, storageUtils, validator, urlUtils, request, probe});
         this.cachedImageSizeFromUrl = new CachedImageSizeFromUrl({
             getImageSizeFromUrl: this.imageSize.getImageSizeFromUrl.bind(this.imageSize),
             cache: cacheStore

package/core/server/lib/image/index.js

@@ -1,22 +1,22 @@
 const request = require('@tryghost/request');
-const urlUtils = require('../../../shared/url-utils');
-const storage = require('../../adapters/storage');
+const urlUtils = require('../../../shared/url-utils').default;
 const storageUtils = require('../../adapters/storage/utils');
 const validator = require('@tryghost/validator');
 const config = require('../../../shared/config');
 const settingsCache = require('../../../shared/settings-cache');
 const ImageUtils = require('./image-utils');
 
-const adapterManager = require('../../services/adapter-manager');
+const adapterManager = require('../../services/adapter-manager').default;
 
 const cacheStore = adapterManager.getAdapter('cache:imageSizes');
+const imageStore = adapterManager.getAdapter('storage:images');
 
 module.exports = new ImageUtils({
     config,
     urlUtils,
     settingsCache,
     storageUtils,
-    storage,
+    imageStore,
     validator,
     request,
     cacheStore

package/core/server/lib/lexical.js

@@ -1,10 +1,10 @@
 const path = require('path');
 const errors = require('@tryghost/errors');
-const urlUtils = require('../../shared/url-utils');
+const urlUtils = require('../../shared/url-utils').default;
 const config = require('../../shared/config');
 const labs = require('../../shared/labs');
 const settingsCache = require('../../shared/settings-cache');
-const storage = require('../adapters/storage');
+const adapterManager = require('../services/adapter-manager').default;
 
 let nodes;
 let lexicalHtmlRenderer;
@@ -50,7 +50,7 @@ function buildRenderOptions(userOptions) {
             // NOTE: the "saveRaw" check is smelly
             return imageTransform.canTransformFiles()
                 && imageTransform.shouldResizeFileExtension(ext)
-                && typeof storage.getStorage('images').saveRaw === 'function';
+                && typeof adapterManager.getAdapter('storage:images').saveRaw === 'function';
         },
         canTransformImageToFormat(format) {
             const imageTransform = require('@tryghost/image-transform');

package/core/server/lib/mobiledoc.js

@@ -1,6 +1,6 @@
 const path = require('path');
 const config = require('../../shared/config');
-const storage = require('../adapters/storage');
+const adapterManager = require('../services/adapter-manager').default;
 
 let cardFactory;
 let cards;
@@ -37,7 +37,7 @@ module.exports = {
                     // NOTE: the "saveRaw" check is smelly
                     return imageTransform.canTransformFiles()
                         && imageTransform.shouldResizeFileExtension(ext)
-                        && typeof storage.getStorage('images').saveRaw === 'function';
+                        && typeof adapterManager.getAdapter('storage:images').saveRaw === 'function';
                 }
             });
 

package/core/server/lib/validate-password.js

@@ -4,7 +4,7 @@ const validator = require('@tryghost/validator');
 
 const tpl = require('@tryghost/tpl');
 const settingsCache = require('../../shared/settings-cache');
-const urlUtils = require('../../shared/url-utils');
+const urlUtils = require('../../shared/url-utils').default;
 
 const messages = {
     passwordDoesNotComplyLength: 'Your password must be at least {minLength} characters long.',

package/core/server/models/action.js

@@ -1,5 +1,12 @@
 const ghostBookshelf = require('./base');
 
+// Member custom fields are owned by a raw-knex service rather than the Bookshelf
+// registry. Actions still need a read model for `include=resource` to recognise
+// their polymorphic resource type and load the current field definition.
+const MemberCustomFieldResource = ghostBookshelf.Model.extend({
+    tableName: 'members_custom_fields'
+});
+
 const Action = ghostBookshelf.Model.extend({
     tableName: 'actions',
 
@@ -18,6 +25,8 @@ const Action = ghostBookshelf.Model.extend({
             candidates.push([User, 'security_action']);
         }
 
+        candidates.push([MemberCustomFieldResource, 'member_custom_field']);
+
         return candidates;
     },
 

package/core/server/models/base/plugins/generate-slug.js

@@ -1,7 +1,7 @@
 const _ = require('lodash');
 const security = require('@tryghost/security');
 
-const urlUtils = require('../../../../shared/url-utils');
+const urlUtils = require('../../../../shared/url-utils').default;
 
 /**
  * @type {Bookshelf} Bookshelf

package/core/server/models/collection.js

@@ -1,5 +1,5 @@
 const ghostBookshelf = require('./base');
-const urlUtils = require('../../shared/url-utils');
+const urlUtils = require('../../shared/url-utils').default;
 
 const Collection = ghostBookshelf.Model.extend({
     tableName: 'collections',

package/core/server/models/custom-theme-setting.js

@@ -1,6 +1,6 @@
 const _ = require('lodash');
 const ghostBookshelf = require('./base');
-const urlUtils = require('../../shared/url-utils');
+const urlUtils = require('../../shared/url-utils').default;
 
 const CustomThemeSetting = ghostBookshelf.Model.extend({
     tableName: 'custom_theme_settings',

package/core/server/models/member.js

@@ -4,6 +4,70 @@ const _ = require('lodash');
 const config = require('../../shared/config');
 const {MemberCommentingCodec} = require('../services/members/commenting');
 
+const DEEP_OFFSET_THRESHOLD = 1000;
+
+// The rewrite only applies to the plain single-table browse query. Joins,
+// group by, unions etc. at the top level of the statement mean some other
+// query shape — but the same keywords inside parens (NQL filters and search
+// compile to `where members.id in (select ... join ...)`) are fine, so only
+// depth-0 SQL is inspected. Bindings are `?` placeholders, so no user data
+// appears in the inspected string.
+function sqlOutsideParens(sql) {
+    let depth = 0;
+    let result = '';
+
+    for (const char of sql) {
+        if (char === '(') {
+            depth += 1;
+        } else if (char === ')') {
+            depth -= 1;
+        } else if (depth === 0) {
+            result += char;
+        }
+    }
+
+    return result;
+}
+
+// Deferred join for deep OFFSET pagination: plain LIMIT/OFFSET does a full
+// row lookup for every discarded OFFSET row, so deep browse pages took ~10s
+// on large sites. Instead, run LIMIT/OFFSET over a subquery selecting only
+// the primary key (covered by the (created_at, id) index), then join back to
+// fetch full rows for just the final page.
+//
+// The query is inspected via its compiled SQL (`qb.toSQL()`, public knex API)
+// rather than knex's internal builder state. The prefix/suffix anchors below
+// mean anything unexpected — custom selects, a lock clause, missing
+// limit/offset — safely skips the rewrite.
+function applyDeferredJoinForDeepOffset(qb) {
+    const {sql, bindings} = qb.toSQL();
+
+    // The plain browse query compiles to
+    // `select * from `members` [where ...] order by ... limit ? offset ?`;
+    // knex passes limit and offset as the last two bindings
+    if (!sql.startsWith('select * from `members`') || !sql.endsWith('limit ? offset ?')) {
+        return;
+    }
+
+    const offset = bindings[bindings.length - 1];
+
+    if (!Number.isInteger(offset) || offset < DEEP_OFFSET_THRESHOLD) {
+        return;
+    }
+
+    const topLevelSql = sqlOutsideParens(sql);
+    if ([' join ', ' group by ', ' having ', ' union '].some(keyword => topLevelSql.includes(keyword))) {
+        return;
+    }
+
+    // Aliased so the default raw browse order (`created_at DESC, id DESC`)
+    // stays unambiguous in the outer query
+    const idSubquery = qb.clone().select('members.id as deep_page_id');
+
+    qb.clear('where').clear('limit').clear('offset')
+        .innerJoin(idSubquery.as('deep_page'), 'members.id', 'deep_page.deep_page_id');
+}
+
 const Member = ghostBookshelf.Model.extend({
     tableName: 'members',
 
@@ -357,6 +421,15 @@ const Member = ghostBookshelf.Model.extend({
         return result;
     },
 
+    // Fires with the fully-built knex query (filters/order/limit/offset
+    // applied, select columns not yet); the count query runs before this
+    // event, so pagination meta is unaffected by the rewrite
+    onFetchingCollection: function onFetchingCollection(collection, columns, options) {
+        ghostBookshelf.Model.prototype.onFetchingCollection.apply(this, arguments);
+
+        applyDeferredJoinForDeepOffset(options.query);
+    },
+
     onDestroyed: function onDestroyed(model, options) {
         const result = ghostBookshelf.Model.prototype.onDestroyed.apply(this, arguments);
 

package/core/server/models/newsletter.js

@@ -1,7 +1,7 @@
 const ghostBookshelf = require('./base');
 const ObjectID = require('bson-objectid').default;
 const crypto = require('crypto');
-const urlUtils = require('../../shared/url-utils');
+const urlUtils = require('../../shared/url-utils').default;
 
 const Newsletter = ghostBookshelf.Model.extend({
     tableName: 'newsletters',

package/core/server/models/post.js

@@ -14,7 +14,7 @@ const limitService = require('../services/limits');
 const mobiledocLib = require('../lib/mobiledoc');
 const lexicalLib = require('../lib/lexical');
 const relations = require('./relations');
-const urlUtils = require('../../shared/url-utils');
+const urlUtils = require('../../shared/url-utils').default;
 const {Tag} = require('./tag');
 const {Newsletter} = require('./newsletter');
 const {BadRequestError} = require('@tryghost/errors');
@@ -950,15 +950,29 @@ Post = ghostBookshelf.Model.extend({
     },
 
     authors: function authors() {
+        // posts_authors.id breaks sort_order ties deterministically (by attach
+        // order); without it MySQL can order tied rows differently per query,
+        // which changes the computed primary_author. See tags() below.
+        // `id` is pivoted in so it is in the SELECT list — the query uses
+        // DISTINCT, which requires ORDER BY columns to be selected.
         return this.belongsToMany('User', 'posts_authors', 'post_id', 'author_id')
-            .withPivot('sort_order')
-            .query('orderBy', 'sort_order', 'ASC');
+            .withPivot(['sort_order', 'id'])
+            .query('orderBy', 'sort_order', 'ASC')
+            .query('orderBy', 'posts_authors.id', 'ASC');
     },
 
     tags: function tags() {
+        // posts_tags.id breaks sort_order ties deterministically (by attach
+        // order). primary_tag is tags[0]-if-public, so a non-deterministic tie
+        // order (which MySQL produces for tags sharing a sort_order) makes the
+        // primary tag — and the post's URL under a {primary_tag} permalink —
+        // depend on the query shape.
+        // `id` is pivoted in so it is in the SELECT list — the query uses
+        // DISTINCT, which requires ORDER BY columns to be selected.
         return this.belongsToMany('Tag', 'posts_tags', 'post_id', 'tag_id')
-            .withPivot('sort_order')
-            .query('orderBy', 'sort_order', 'ASC');
+            .withPivot(['sort_order', 'id'])
+            .query('orderBy', 'sort_order', 'ASC')
+            .query('orderBy', 'posts_tags.id', 'ASC');
     },
 
     mobiledoc_revisions() {

package/core/server/models/posts-meta.js

@@ -1,5 +1,5 @@
 const ghostBookshelf = require('./base');
-const urlUtils = require('../../shared/url-utils');
+const urlUtils = require('../../shared/url-utils').default;
 
 const PostsMeta = ghostBookshelf.Model.extend({
     tableName: 'posts_meta',

package/core/server/models/redirect.js

@@ -1,5 +1,5 @@
 const ghostBookshelf = require('./base');
-const urlUtils = require('../../shared/url-utils');
+const urlUtils = require('../../shared/url-utils').default;
 
 const Redirect = ghostBookshelf.Model.extend({
     tableName: 'redirects',

package/core/server/models/settings.js

@@ -6,7 +6,7 @@ const ghostBookshelf = require('./base');
 const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
 const validator = require('@tryghost/validator');
-const urlUtils = require('../../shared/url-utils');
+const urlUtils = require('../../shared/url-utils').default;
 const {WRITABLE_KEYS_ALLOWLIST} = require('../../shared/labs');
 const {getOrGenerateSiteUuid} = require('../services/settings/settings-utils');
 

package/core/server/models/snippet.js

@@ -1,5 +1,5 @@
 const ghostBookshelf = require('./base');
-const urlUtils = require('../../shared/url-utils');
+const urlUtils = require('../../shared/url-utils').default;
 const mobiledocLib = require('../lib/mobiledoc');
 const lexicalLib = require('../lib/lexical');
 const _ = require('lodash');

package/core/server/models/tag.js

@@ -1,7 +1,7 @@
 const ghostBookshelf = require('./base');
 const tpl = require('@tryghost/tpl');
 const errors = require('@tryghost/errors');
-const urlUtils = require('../../shared/url-utils');
+const urlUtils = require('../../shared/url-utils').default;
 
 const messages = {
     tagNotFound: 'Tag not found.'

package/core/server/models/user.js

@@ -9,7 +9,7 @@ const security = require('@tryghost/security');
 const {pipeline} = require('@tryghost/promise');
 const validatePassword = require('../lib/validate-password');
 const permissions = require('../services/permissions');
-const urlUtils = require('../../shared/url-utils');
+const urlUtils = require('../../shared/url-utils').default;
 const {setIsRoles} = require('./role-utils');
 const activeStates = ['active', 'warn-1', 'warn-2', 'warn-3', 'warn-4'];
 const ASSIGNABLE_ROLES = ['Administrator', 'Super Editor', 'Editor', 'Author', 'Contributor'];

package/core/server/models/welcome-email-automated-email.js

@@ -1,6 +1,6 @@
 const ghostBookshelf = require('./base');
 const errors = require('@tryghost/errors');
-const urlUtils = require('../../shared/url-utils');
+const urlUtils = require('../../shared/url-utils').default;
 const lexicalLib = require('../lib/lexical');
 const {DEFAULT_EMAIL_DESIGN_SETTING_SLUG} = require('../services/member-welcome-emails/constants');
 

package/core/server/services/activitypub/activity-pub-service-wrapper.js

@@ -14,7 +14,7 @@ module.exports = class ActivityPubServiceWrapper {
         const logging = require('@tryghost/logging');
         const events = require('../../lib/common/events');
         const {knex} = require('../../data/db');
-        const urlUtils = require('../../../shared/url-utils');
+        const urlUtils = require('../../../shared/url-utils').default;
         const IdentityTokenServiceWrapper = require('../identity-tokens');
         const settingsCache = require('../../../shared/settings-cache');