ghost 6.60.0 → 6.62.0

package/core/server/data/seeders/importers/automation-actions-importer.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AutomationActionsImporter = void 0;
 const errors_1 = __importDefault(require("@tryghost/errors"));
 const table_importer_1 = require("./table-importer");
-const db_date_1 = require("../../../lib/db-date");
+const date_1 = require("../../../lib/db-types/date");
 const random_1 = require("../utils/random");
 class AutomationActionsImporter extends table_importer_1.TableImporter {
     static table = 'automation_actions';
@@ -41,8 +41,8 @@ class AutomationActionsImporter extends table_importer_1.TableImporter {
         this.#actionIndex += 1;
         return {
             id: this.fastFakeObjectId(),
-            created_at: (0, db_date_1.toDatabaseDate)(createdAt),
-            updated_at: (0, db_date_1.toDatabaseDate)(createdAt),
+            created_at: (0, date_1.toDatabaseDate)(createdAt),
+            updated_at: (0, date_1.toDatabaseDate)(createdAt),
             deleted_at: null,
             automation_id: this.#automation.id,
             type,

package/core/server/data/seeders/importers/automation-run-steps-importer.js

@@ -8,7 +8,7 @@ const faker_1 = require("@faker-js/faker");
 const errors_1 = __importDefault(require("@tryghost/errors"));
 const lodash_1 = require("lodash");
 const table_importer_1 = require("./table-importer");
-const db_date_1 = require("../../../lib/db-date");
+const date_1 = require("../../../lib/db-types/date");
 class AutomationRunStepsImporter extends table_importer_1.TableImporter {
     static table = 'automation_run_steps';
     static dependencies = [
@@ -86,12 +86,12 @@ class AutomationRunStepsImporter extends table_importer_1.TableImporter {
                 ? requestedStepCount
                 : actionCount;
             fullPathGeneratedForAutomation.add(run.automation_id);
-            const runCreatedAt = (0, db_date_1.fromDatabaseDate)(run.created_at);
+            const runCreatedAt = (0, date_1.fromDatabaseDate)(run.created_at);
             const lastStepStatus = faker_1.faker.helpers.arrayElement(['pending', 'finished', 'failed']);
             for (let index = 0; index < runStepCount; index += 1) {
                 const createdAt = new Date(runCreatedAt);
                 createdAt.setHours(createdAt.getHours() + index);
-                const createdAtString = (0, db_date_1.toDatabaseDate)(createdAt);
+                const createdAtString = (0, date_1.toDatabaseDate)(createdAt);
                 const status = index === runStepCount - 1 ? lastStepStatus : 'finished';
                 const isTerminal = status !== 'pending';
                 steps.push({

package/core/server/data/seeders/importers/automation-runs-importer.js

@@ -9,7 +9,7 @@ const errors_1 = __importDefault(require("@tryghost/errors"));
 const strict_1 = __importDefault(require("node:assert/strict"));
 const table_importer_1 = require("./table-importer");
 const parse_email_address_1 = require("@tryghost/parse-email-address");
-const db_date_1 = require("../../../lib/db-date");
+const date_1 = require("../../../lib/db-types/date");
 const random_1 = require("../utils/random");
 const assertExampleEmailDomain = (email) => {
     const { domain } = (0, parse_email_address_1.parseEmailAddress)(email) ?? {};
@@ -51,14 +51,14 @@ class AutomationRunsImporter extends table_importer_1.TableImporter {
             });
         }
         const member = faker_1.faker.helpers.arrayElement(this.#members);
-        const automationCreatedAt = (0, db_date_1.fromDatabaseDate)(this.#automation.created_at);
-        const memberCreatedAt = (0, db_date_1.fromDatabaseDate)(member.created_at);
+        const automationCreatedAt = (0, date_1.fromDatabaseDate)(this.#automation.created_at);
+        const memberCreatedAt = (0, date_1.fromDatabaseDate)(member.created_at);
         const createdAt = (0, random_1.randomDateBetween)(new Date(Math.max(automationCreatedAt.valueOf(), memberCreatedAt.valueOf())), new Date());
         assertExampleEmailDomain(member.email);
         return {
             id: this.fastFakeObjectId(),
-            created_at: (0, db_date_1.toDatabaseDate)(createdAt),
-            updated_at: (0, db_date_1.toDatabaseDate)(createdAt),
+            created_at: (0, date_1.toDatabaseDate)(createdAt),
+            updated_at: (0, date_1.toDatabaseDate)(createdAt),
             automation_id: this.#automation.id,
             member_id: member.id,
             member_email: member.email,

package/core/server/data/seeders/importers/automations-importer.js

@@ -7,7 +7,7 @@ const string_1 = require("@tryghost/string");
 const table_importer_1 = require("./table-importer");
 // @ts-expect-error This module currently lacks type definitions.
 const blog_info_1 = require("../utils/blog-info");
-const db_date_1 = require("../../../lib/db-date");
+const date_1 = require("../../../lib/db-types/date");
 const constants_1 = require("../../../services/member-welcome-emails/constants");
 const defaultAutomations = [
     {
@@ -40,8 +40,8 @@ class AutomationsImporter extends table_importer_1.TableImporter {
             status: faker_1.faker.helpers.arrayElement(['active', 'inactive']),
             name,
             slug,
-            created_at: (0, db_date_1.toDatabaseDate)(createdAt),
-            updated_at: (0, db_date_1.toDatabaseDate)(createdAt),
+            created_at: (0, date_1.toDatabaseDate)(createdAt),
+            updated_at: (0, date_1.toDatabaseDate)(createdAt),
         };
     }
 }

package/core/server/data/seeders/importers/comment-reports-importer.js

@@ -1,7 +1,7 @@
 const { TableImporter } = require('./table-importer');
 const { faker } = require('@faker-js/faker');
 const { luck, randomDateBetween } = require('../utils/random');
-const { toDatabaseDate } = require('../../../lib/db-date');
+const { toDatabaseDate } = require('../../../lib/db-types/date');
 
 class CommentReportsImporter extends TableImporter {
   static table = 'comment_reports';

package/core/server/data/seeders/importers/comments-importer.js

@@ -2,7 +2,7 @@ const { faker } = require('@faker-js/faker');
 const { TableImporter } = require('./table-importer');
 const { luck } = require('../utils/random');
 const generateEvents = require('../utils/event-generator');
-const { fromDatabaseDate, toDatabaseDate } = require('../../../lib/db-date');
+const { fromDatabaseDate, toDatabaseDate } = require('../../../lib/db-types/date');
 
 class CommentsImporter extends TableImporter {
   static table = 'comments';

package/core/server/data/seeders/importers/email-batches-importer.js

@@ -1,7 +1,7 @@
 const { TableImporter } = require('./table-importer');
 const { faker } = require('@faker-js/faker');
 const { randomDateBetween } = require('../utils/random');
-const { fromDatabaseDate, toDatabaseDate } = require('../../../lib/db-date');
+const { fromDatabaseDate, toDatabaseDate } = require('../../../lib/db-types/date');
 
 class EmailBatchesImporter extends TableImporter {
   static table = 'email_batches';

package/core/server/data/seeders/importers/email-recipients-importer.js

@@ -2,7 +2,7 @@ const { TableImporter } = require('./table-importer');
 const { faker } = require('@faker-js/faker');
 const generateEvents = require('../utils/event-generator');
 const { randomDateBetween } = require('../utils/random');
-const { fromDatabaseDate, toDatabaseDate } = require('../../../lib/db-date');
+const { fromDatabaseDate, toDatabaseDate } = require('../../../lib/db-types/date');
 const debug = require('@tryghost/debug')('EmailRecipientsImporter');
 
 const emailStatus = {

package/core/server/data/seeders/importers/emails-importer.js

@@ -2,7 +2,7 @@ const { TableImporter } = require('./table-importer');
 const { faker } = require('@faker-js/faker');
 const generateEvents = require('../utils/event-generator');
 const { luck } = require('../utils/random');
-const { fromDatabaseDate, toDatabaseDate } = require('../../../lib/db-date');
+const { fromDatabaseDate, toDatabaseDate } = require('../../../lib/db-types/date');
 
 class EmailsImporter extends TableImporter {
   static table = 'emails';

package/core/server/data/seeders/importers/labels-importer.js

@@ -2,7 +2,7 @@ const { TableImporter } = require('./table-importer');
 const { faker } = require('@faker-js/faker');
 const { slugify } = require('@tryghost/string');
 const { blogStartDate } = require('../utils/blog-info');
-const { toDatabaseDate } = require('../../../lib/db-date');
+const { toDatabaseDate } = require('../../../lib/db-types/date');
 
 class LabelsImporter extends TableImporter {
   static table = 'labels';

package/core/server/data/seeders/importers/members-click-events-importer.js

@@ -1,7 +1,7 @@
 const { TableImporter } = require('./table-importer');
 const { faker } = require('@faker-js/faker');
 const { luck, randomDateBetween } = require('../utils/random');
-const { fromDatabaseDate, toDatabaseDate } = require('../../../lib/db-date');
+const { fromDatabaseDate, toDatabaseDate } = require('../../../lib/db-types/date');
 
 class MembersClickEventsImporter extends TableImporter {
   static table = 'members_click_events';

package/core/server/data/seeders/importers/members-created-events-importer.js

@@ -1,7 +1,7 @@
 const { TableImporter } = require('./table-importer');
 const { faker } = require('@faker-js/faker');
 const { luck } = require('../utils/random');
-const { fromDatabaseDate, toDatabaseDate } = require('../../../lib/db-date');
+const { fromDatabaseDate, toDatabaseDate } = require('../../../lib/db-types/date');
 
 class MembersCreatedEventsImporter extends TableImporter {
   static table = 'members_created_events';

package/core/server/data/seeders/importers/members-feedback-importer.js

@@ -1,6 +1,6 @@
 const { TableImporter } = require('./table-importer');
 const { luck, randomDateBetween } = require('../utils/random');
-const { fromDatabaseDate, toDatabaseDate } = require('../../../lib/db-date');
+const { fromDatabaseDate, toDatabaseDate } = require('../../../lib/db-types/date');
 
 class MembersFeedbackImporter extends TableImporter {
   static table = 'members_feedback';

package/core/server/data/seeders/importers/members-importer.js

@@ -4,7 +4,7 @@ const { faker: americanFaker } = require('@faker-js/faker/locale/en_US');
 const { blogStartDate: startTime } = require('../utils/blog-info');
 const generateEvents = require('../utils/event-generator');
 const { luck } = require('../utils/random');
-const { toDatabaseDate } = require('../../../lib/db-date');
+const { toDatabaseDate } = require('../../../lib/db-types/date');
 const debug = require('@tryghost/debug')('MembersImporter');
 
 class MembersImporter extends TableImporter {

package/core/server/data/seeders/importers/members-login-events-importer.js

@@ -1,7 +1,7 @@
 const { TableImporter } = require('./table-importer');
 const { luck } = require('../utils/random');
 const generateEvents = require('../utils/event-generator');
-const { fromDatabaseDate, toDatabaseDate } = require('../../../lib/db-date');
+const { fromDatabaseDate, toDatabaseDate } = require('../../../lib/db-types/date');
 
 class MembersLoginEventsImporter extends TableImporter {
   static table = 'members_login_events';

package/core/server/data/seeders/importers/members-products-importer.js

@@ -1,7 +1,7 @@
 const { faker } = require('@faker-js/faker');
 const { TableImporter } = require('./table-importer');
 const { luck } = require('../utils/random');
-const { toDatabaseDate } = require('../../../lib/db-date');
+const { toDatabaseDate } = require('../../../lib/db-types/date');
 
 class MembersProductsImporter extends TableImporter {
   static table = 'members_products';

package/core/server/data/seeders/importers/members-status-events-importer.js

@@ -1,6 +1,6 @@
 const { TableImporter } = require('./table-importer');
 const { randomDateBetween } = require('../utils/random');
-const { toDatabaseDate } = require('../../../lib/db-date');
+const { toDatabaseDate } = require('../../../lib/db-types/date');
 
 class MembersStatusEventsImporter extends TableImporter {
   static table = 'members_status_events';

package/core/server/data/seeders/importers/members-stripe-customers-importer.js

@@ -1,6 +1,6 @@
 const { faker } = require('@faker-js/faker');
 const { TableImporter } = require('./table-importer');
-const { fromDatabaseDate } = require('../../../lib/db-date');
+const { fromDatabaseDate } = require('../../../lib/db-types/date');
 
 class MembersStripeCustomersImporter extends TableImporter {
   static table = 'members_stripe_customers';

package/core/server/data/seeders/importers/members-stripe-customers-subscriptions-importer.js

@@ -2,7 +2,7 @@ const { faker } = require('@faker-js/faker');
 const { TableImporter } = require('./table-importer');
 const generateEvents = require('../utils/event-generator');
 const { luck } = require('../utils/random');
-const { fromDatabaseDate, toDatabaseDate } = require('../../../lib/db-date');
+const { fromDatabaseDate, toDatabaseDate } = require('../../../lib/db-types/date');
 
 class MembersStripeCustomersSubscriptionsImporter extends TableImporter {
   static table = 'members_stripe_customers_subscriptions';

package/core/server/data/seeders/importers/members-subscribe-events-importer.js

@@ -1,6 +1,6 @@
 const { TableImporter } = require('./table-importer');
 const { luck, randomDateBetween } = require('../utils/random');
-const { toDatabaseDate } = require('../../../lib/db-date');
+const { toDatabaseDate } = require('../../../lib/db-types/date');
 
 class MembersSubscribeEventsImporter extends TableImporter {
   static table = 'members_subscribe_events';

package/core/server/data/seeders/importers/members-subscription-created-events-importer.js

@@ -1,7 +1,7 @@
 const { TableImporter } = require('./table-importer');
 const { faker } = require('@faker-js/faker');
 const { luck } = require('../utils/random');
-const { fromDatabaseDate } = require('../../../lib/db-date');
+const { fromDatabaseDate } = require('../../../lib/db-types/date');
 
 class MembersSubscriptionCreatedEventsImporter extends TableImporter {
   static table = 'members_subscription_created_events';

package/core/server/data/seeders/importers/offer-redemptions-importer.js

@@ -2,7 +2,7 @@ const { faker } = require('@faker-js/faker');
 const errors = require('@tryghost/errors');
 const { TableImporter } = require('./table-importer');
 const { randomDateBetween } = require('../utils/random');
-const { fromDatabaseDate, toDatabaseDate } = require('../../../lib/db-date');
+const { fromDatabaseDate, toDatabaseDate } = require('../../../lib/db-types/date');
 
 class OfferRedemptionsImporter extends TableImporter {
   static table = 'offer_redemptions';

package/core/server/data/seeders/importers/offers-importer.js

@@ -1,7 +1,7 @@
 const { TableImporter } = require('./table-importer');
 const { slugify } = require('@tryghost/string');
 const { blogStartDate } = require('../utils/blog-info');
-const { toDatabaseDate } = require('../../../lib/db-date');
+const { toDatabaseDate } = require('../../../lib/db-types/date');
 
 const offerTemplates = [
   {

package/core/server/data/seeders/importers/posts-importer.js

@@ -2,7 +2,7 @@ const { faker } = require('@faker-js/faker');
 const { slugify } = require('@tryghost/string');
 const { luck } = require('../utils/random');
 const { TableImporter } = require('./table-importer');
-const { toDatabaseDate } = require('../../../lib/db-date');
+const { toDatabaseDate } = require('../../../lib/db-types/date');
 
 class PostsImporter extends TableImporter {
   static table = 'posts';

package/core/server/data/seeders/importers/table-importer.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TableImporter = void 0;
 const debug_1 = __importDefault(require("@tryghost/debug"));
-const db_date_1 = require("../../../lib/db-date");
+const date_1 = require("../../../lib/db-types/date");
 const node_path_1 = __importDefault(require("node:path"));
 const node_fs_1 = __importDefault(require("node:fs"));
 const papaparse_1 = __importDefault(require("papaparse"));
@@ -101,7 +101,7 @@ class TableImporter {
                             mutableObj[key] = value ? 1 : 0;
                         }
                         else if (value instanceof Date) {
-                            mutableObj[key] = (0, db_date_1.toDatabaseDate)(value);
+                            mutableObj[key] = (0, date_1.toDatabaseDate)(value);
                         }
                         else if (value === null) {
                             mutableObj[key] = '\\N';

package/core/server/data/seeders/importers/tags-importer.js

@@ -1,7 +1,7 @@
 const { faker } = require('@faker-js/faker');
 const { slugify } = require('@tryghost/string');
 const { TableImporter } = require('./table-importer');
-const { toDatabaseDate } = require('../../../lib/db-date');
+const { toDatabaseDate } = require('../../../lib/db-types/date');
 
 class TagsImporter extends TableImporter {
   static table = 'tags';

package/core/server/data/seeders/importers/users-importer.js

@@ -2,7 +2,7 @@ const { TableImporter } = require('./table-importer');
 const { faker } = require('@faker-js/faker');
 const { slugify } = require('@tryghost/string');
 const security = require('@tryghost/security');
-const { toDatabaseDate } = require('../../../lib/db-date');
+const { toDatabaseDate } = require('../../../lib/db-types/date');
 
 class UsersImporter extends TableImporter {
   static table = 'users';

package/core/server/data/seeders/importers/web-mentions-importer.js

@@ -1,6 +1,6 @@
 const { TableImporter } = require('./table-importer');
 const { faker } = require('@faker-js/faker');
-const { toDatabaseDate } = require('../../../lib/db-date');
+const { toDatabaseDate } = require('../../../lib/db-types/date');
 
 class WebMentionsImporter extends TableImporter {
   static table = 'mentions';

package/core/server/data/seeders/utils/random.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.luck = void 0;
 exports.randomDateBetween = randomDateBetween;
 const faker_1 = require("@faker-js/faker");
-const db_date_1 = require("../../../lib/db-date");
+const date_1 = require("../../../lib/db-types/date");
 /**
  * Adds another degree of randomness into some decisions
  * @param lowerThan Only this % of people will achieve this luck
@@ -15,7 +15,7 @@ const luck = (lowerThan) => faker_1.faker.number.int({
 }) <= lowerThan;
 exports.luck = luck;
 function randomDateBetween(start, end) {
-    const earliest = (0, db_date_1.fromDatabaseDate)(start);
-    const latest = (0, db_date_1.fromDatabaseDate)(end);
+    const earliest = (0, date_1.fromDatabaseDate)(start);
+    const latest = (0, date_1.fromDatabaseDate)(end);
     return latest > earliest ? faker_1.faker.date.between({ from: earliest, to: latest }) : earliest;
 }

package/core/server/ghost-server.js

@@ -18,6 +18,7 @@ const flush_logs_1 = require("../shared/flush-logs");
 const moment_1 = __importDefault(require("moment"));
 const stoppable_1 = __importDefault(require("stoppable"));
 const node_util_1 = require("node:util");
+const node_assert_1 = __importDefault(require("node:assert"));
 const debug = (0, debug_1.default)('server');
 const messages = {
     cantTouchThis: "Can't touch this",
@@ -216,7 +217,7 @@ class GhostServer {
      */
     async _stopServer() {
         const { httpServer } = this;
-        assert(httpServer, 'httpServer must be set before stopping server');
+        (0, node_assert_1.default)(httpServer, 'httpServer must be set before stopping server');
         const startTime = Date.now();
         try {
             return await (0, node_util_1.promisify)(httpServer.stop.bind(httpServer))();
@@ -280,7 +281,7 @@ class GhostServer {
         const connectionInterval = setInterval(() => this.httpServer?.getConnections((_err, connections) => logging_1.default.warn(`${connections} connections currently open`)), 5000);
         // Output a notice when the server closes
         const { httpServer } = this;
-        assert(httpServer, 'httpServer must be set before starting test mode');
+        (0, node_assert_1.default)(httpServer, 'httpServer must be set before starting test mode');
         httpServer.on('close', function () {
             clearInterval(connectionInterval);
             logging_1.default.warn('Server has fully closed');

package/core/server/lib/db-types/boolean.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DbBoolean = void 0;
+const zod_1 = require("zod");
+/**
+ * A boolean column, whichever engine handed it back.
+ *
+ * SQLite has no boolean type and answers with 0 or 1; MySQL answers with a boolean. Every
+ * read normalises so nothing downstream has to know which database it is talking to, and
+ * so a falsy check never has to reason about the number zero.
+ *
+ * Encoding leaves the value alone: a boolean column takes a boolean, and takes the 0 or 1
+ * it gave us just as happily.
+ */
+exports.DbBoolean = zod_1.z.codec(zod_1.z.union([zod_1.z.boolean(), zod_1.z.number()]), zod_1.z.boolean(), {
+    decode: (stored) => Boolean(stored),
+    encode: (value) => value,
+});

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

@@ -31,6 +31,12 @@ class ImageSize {
       },
       response_timeout: this.config.get('times:getImageSizeTimeoutInMS') || 10000,
     };
+
+    // Coalesces concurrent getImageSizeFromUrl() calls for the same URL so we only
+    // ever issue one underlying request/read per URL at a time. A single post's
+    // coverImage/ogImage/twitterImage often resolve to the same feature_image URL
+    // and are looked up concurrently, which otherwise fans out into duplicate requests.
+    this.inFlightImageSizeLookups = new Map();
   }
 
   // processes the Buffer result of an image file using image-size
@@ -153,6 +159,24 @@ class ImageSize {
    * @returns {Promise<Object>} imageObject or error
    */
   getImageSizeFromUrl(imagePath) {
+    if (this.inFlightImageSizeLookups.has(imagePath)) {
+      return this.inFlightImageSizeLookups.get(imagePath);
+    }
+
+    const promise = this._getImageSizeFromUrl(imagePath).finally(() => {
+      this.inFlightImageSizeLookups.delete(imagePath);
+    });
+    this.inFlightImageSizeLookups.set(imagePath, promise);
+
+    return promise;
+  }
+
+  /**
+   * @description read image dimensions from URL, without in-flight deduplication
+   * @param {string} imagePath as URL
+   * @returns {Promise<Object>} imageObject or error
+   */
+  _getImageSizeFromUrl(imagePath) {
     if (this.storageUtils.isLocalImage(imagePath)) {
       // don't make a request for a locally stored image
       return this.getImageSizeFromStoragePath(imagePath);

package/core/server/lib/package-json/parse.js

@@ -37,7 +37,7 @@ async function parse(path) {
       message: tpl(messages.themeFileIsMalformed),
       context: path,
       err: parseError,
-      help: tpl(messages.willBeRequired, { url: 'https://ghost.org/docs/themes/' }),
+      help: tpl(messages.willBeRequired, { url: 'https://docs.ghost.org/themes/' }),
     });
   }
 
@@ -47,7 +47,7 @@ async function parse(path) {
     throw new errors.IncorrectUsageError({
       message: tpl(messages.nameOrVersionMissing),
       context: path,
-      help: tpl(messages.willBeRequired, { url: 'https://ghost.org/docs/themes/' }),
+      help: tpl(messages.willBeRequired, { url: 'https://docs.ghost.org/themes/' }),
     });
   }
 

package/core/server/lib/promise-pool.js

@@ -0,0 +1,31 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.promisePool = void 0;
+const errors_1 = __importDefault(require("@tryghost/errors"));
+const validateMaxConcurrency = (maxConcurrency) => {
+    if (maxConcurrency < 1 || !Number.isSafeInteger(maxConcurrency)) {
+        throw new errors_1.default.IncorrectUsageError({
+            message: 'Concurrency must be a positive integer',
+        });
+    }
+};
+/**
+ * Run promise-returning tasks with a bounded level of concurrency.
+ */
+const promisePool = async (tasks, maxConcurrency) => {
+    validateMaxConcurrency(maxConcurrency);
+    const taskIterator = tasks.values();
+    const concurrency = Math.min(maxConcurrency, tasks.length);
+    const workers = Array(concurrency)
+        .fill(taskIterator)
+        .map(async (workerIterator) => {
+        for (const task of workerIterator) {
+            await task();
+        }
+    });
+    await Promise.all(workers);
+};
+exports.promisePool = promisePool;

package/core/server/models/member.js

@@ -3,7 +3,6 @@ const crypto = require('crypto');
 const _ = require('lodash');
 const { chainTransformers } = require('@tryghost/mongo-utils');
 const config = require('../../shared/config');
-const labs = require('../../shared/labs');
 const { MemberCommentingCodec } = require('../services/members/commenting');
 const {
   CUSTOM_FIELDS_RELATION,
@@ -191,18 +190,12 @@ const Member = ghostBookshelf.Model.extend(
       ];
     },
 
-    // Chain the custom-field filter transformer at this single choke point — the method
-    // every members query routes its filter through (list, CSV export, bulk edit/destroy,
-    // count, email send all reach it via findPage or getFilteredCollectionQuery) — so a
-    // saved `custom_fields.*` segment works the same everywhere without each call site
-    // wiring it. Runs only behind the flag and only when the filter names the relation; the
-    // transformer maps the public `key`/`value` grammar onto the leaf-row columns.
+    // Every members query routes its filter through this one method: list, CSV export, bulk
+    // edit and delete, counts and email sends all reach it via findPage or
+    // getFilteredCollectionQuery. Chaining the metafield filter transformer here covers them
+    // all without any call site wiring it.
     applyDefaultAndCustomFilters(options) {
-      if (
-        labs.isSet('membersCustomFields') &&
-        options.filter &&
-        options.filter.includes(`${CUSTOM_FIELDS_RELATION.tableNameAs}.`)
-      ) {
+      if (options.filter && options.filter.includes(`${CUSTOM_FIELDS_RELATION.tableNameAs}.`)) {
         const transformer = createCustomFieldsFilterTransformer();
         options.mongoTransformer = options.mongoTransformer
           ? chainTransformers(options.mongoTransformer, transformer)
@@ -213,11 +206,7 @@ const Member = ghostBookshelf.Model.extend(
 
     filterRelations() {
       return {
-        // Custom field values are filterable only behind the feature flag. Gating the
-        // relation here (rather than the whole model) means a `custom_fields.*` filter
-        // is simply an unknown relation when the flag is off, and the filter is
-        // rejected — nothing to special-case downstream.
-        ...(labs.isSet('membersCustomFields') ? { custom_fields: CUSTOM_FIELDS_RELATION } : {}),
+        metafields: CUSTOM_FIELDS_RELATION,
         labels: {
           tableName: 'labels',
           type: 'manyToMany',

package/core/server/models/post.js

@@ -29,9 +29,9 @@ const messages = {
   notEnoughPermission: 'You do not have permission to perform this action',
   invalidNewsletter: "The newsletter parameter doesn't match any active newsletter.",
   invalidMobiledocStructure: 'Invalid mobiledoc structure.',
-  invalidMobiledocStructureHelp: 'https://ghost.org/docs/publishing/',
+  invalidMobiledocStructureHelp: 'https://docs.ghost.org/publishing/',
   invalidLexicalStructure: 'Invalid lexical structure.',
-  invalidLexicalStructureHelp: 'https://ghost.org/docs/publishing/',
+  invalidLexicalStructureHelp: 'https://docs.ghost.org/publishing/',
   emailOnlyWithoutNewsletter: 'Scheduling an email requires a newsletter reference.',
 };
 

package/core/server/models/relations/authors.js

@@ -149,7 +149,6 @@ module.exports.extendModel = function extendModel(Post, Posts, ghostBookshelf) {
 
         // CASE: `posts.authors` was not requested, but fetched in specific cases (see top)
         if (
-          !this._originalOptions ||
           !this._originalOptions.withRelated ||
           this._originalOptions.withRelated.indexOf('authors') === -1
         ) {
@@ -157,10 +156,7 @@ module.exports.extendModel = function extendModel(Post, Posts, ghostBookshelf) {
         }
 
         // If the current column settings allow it...
-        if (
-          !options.columns ||
-          (options.columns && options.columns.indexOf('primary_author') > -1)
-        ) {
+        if (!options.columns || options.columns.indexOf('primary_author') > -1) {
           // ... attach a computed property of primary_author which is the first author
           if (attrs.authors && attrs.authors.length) {
             attrs.primary_author = attrs.authors[0];
@@ -398,20 +394,10 @@ module.exports.extendModel = function extendModel(Post, Posts, ghostBookshelf) {
         }
 
         function isOwner() {
-          let isCorrectOwner = true;
-
           if (!unsafeAttrs.authors) {
             return false;
           }
-
-          if (unsafeAttrs.authors) {
-            isCorrectOwner =
-              isCorrectOwner &&
-              unsafeAttrs.authors.length &&
-              unsafeAttrs.authors[0].id === context.user;
-          }
-
-          return isCorrectOwner;
+          return unsafeAttrs.authors.length && unsafeAttrs.authors[0].id === context.user;
         }
 
         function isPrimaryAuthor() {

package/core/server/models/user.js

@@ -43,8 +43,13 @@ const messages = {
 };
 
 /**
- * inactive: owner user before blog setup, suspended users
- * locked user: imported users, they get a random password
+ * `inactive`: suspended staff, who cannot sign in or reset their password.
+ * Also used for the initial owner before site setup is complete.
+ * `locked`: users whose password was randomized by an import or authentication
+ * reset. They must reset their password to regain access.
+ *
+ * Both statuses prevent normal sign-in, so they are grouped here. This is not
+ * a suspension check: isInactive() checks only the literal `inactive` status.
  */
 const inactiveStates = ['inactive', 'locked'];
 
@@ -212,6 +217,8 @@ User = ghostBookshelf.Model.extend(
       return this.save(update, { ...options, patch: true });
     },
 
+    // Checks the literal status, not membership in inactiveStates: locked users
+    // must remain eligible for password resets.
     isInactive: function isInactive() {
       return this.get('status') === 'inactive';
     },