ghost 6.54.0 → 6.54.1

package/core/server/services/automations/database-automations-repository.ts

@@ -65,6 +65,7 @@ interface ActionRow {
 
 type ActionStatsRow = {
     action_id: string;
+    email_clicked_count: number | null;
     email_sent_count: number | null;
     email_opened_count: number | null;
 };
@@ -1264,6 +1265,7 @@ async function loadActionStats(
     const rows: ActionStatsRow[] = await trx('automation_action_revisions')
         .select('action_id')
         .sum({
+            email_clicked_count: 'email_clicked_count',
             email_sent_count: 'email_sent_count',
             email_opened_count: 'email_opened_count'
         })
@@ -1319,6 +1321,7 @@ function buildActionPayload(row: ActionRow, stats: AutomationEmailStats | null):
 }
 
 const EMPTY_EMAIL_STATS: AutomationEmailStats = {
+    email_clicked_count: 0,
     email_sent_count: 0,
     email_opened_count: 0,
     opened_rate: null,
@@ -1326,16 +1329,19 @@ const EMPTY_EMAIL_STATS: AutomationEmailStats = {
 };
 
 function buildEmailStats(row: ActionStatsRow): AutomationEmailStats {
+    const emailClickedCount = row.email_clicked_count ?? 0;
     const emailSentCount = row.email_sent_count ?? 0;
     const emailOpenedCount = row.email_opened_count ?? 0;
     return {
+        email_clicked_count: emailClickedCount,
         email_sent_count: emailSentCount,
         email_opened_count: emailOpenedCount,
         opened_rate: emailSentCount
             ? Math.round(emailOpenedCount / emailSentCount * 100)
             : null,
-        // TODO(NY-1387) Populate clicked_rate once click tracking is implemented.
-        clicked_rate: null
+        clicked_rate: emailSentCount
+            ? Math.round(emailClickedCount / emailSentCount * 100)
+            : null
     };
 }
 

package/core/server/services/comments/comments-service-emails.js

@@ -26,7 +26,10 @@ class CommentsServiceEmails {
      */
     getPostUrl(post, commentId) {
         const postData = toPlain(post);
-        const baseUrl = this.urlService.facade.getUrlForResource({...postData, type: 'posts'}, {absolute: true});
+        // Comments live on pages as well as posts; the URL service routes by
+        // the passed type, so a page typed 'posts' resolves to /404/.
+        const routerType = postData.type === 'page' ? 'pages' : 'posts';
+        const baseUrl = this.urlService.facade.getUrlForResource({...postData, type: routerType}, {absolute: true});
         return `${baseUrl}#ghost-comments-${commentId}`;
     }
 

package/core/server/services/members/{importer → import-export}/config.js

@@ -2,15 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveInlineThreshold = resolveInlineThreshold;
 const zod_1 = require("zod");
-/**
- * Resolving Ghost's config into the values the importer runs on.
- *
- * Config arrives untyped: defaults.json supplies the shipped value, and any
- * higher layer — an operator's config file, an environment variable, argv — can
- * replace it with anything at all. Turning that into something usable is a
- * config concern, so it happens here, at the boundary. The importer is handed an
- * answer and never learns where it came from.
- */
+// Config arrives untyped: defaults.json ships a value, and any higher layer -- an
+// operator's config file, an environment variable, argv -- can replace it with anything.
+// Validating it into a usable number is a config concern, so it happens here at the
+// boundary; the importer is handed a resolved value.
 // The row count at or below which an import is performed while the request is
 // still open. Zero is allowed and means every import is deferred. A numeric
 // string is accepted because a value supplied through an environment variable

package/core/server/services/members/{importer → import-export}/config.ts

@@ -1,14 +1,9 @@
 import {z} from 'zod';
 
-/**
- * Resolving Ghost's config into the values the importer runs on.
- *
- * Config arrives untyped: defaults.json supplies the shipped value, and any
- * higher layer — an operator's config file, an environment variable, argv — can
- * replace it with anything at all. Turning that into something usable is a
- * config concern, so it happens here, at the boundary. The importer is handed an
- * answer and never learns where it came from.
- */
+// Config arrives untyped: defaults.json ships a value, and any higher layer -- an
+// operator's config file, an environment variable, argv -- can replace it with anything.
+// Validating it into a usable number is a config concern, so it happens here at the
+// boundary; the importer is handed a resolved value.
 
 // The row count at or below which an import is performed while the request is
 // still open. Zero is allowed and means every import is deferred. A numeric

package/core/server/services/members/{csv → import-export/csv}/index.js

@@ -3,8 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.unparse = exports.parse = void 0;
+exports.serialize = exports.parse = void 0;
 var parse_1 = require("./parse");
 Object.defineProperty(exports, "parse", { enumerable: true, get: function () { return __importDefault(parse_1).default; } });
-var unparse_1 = require("./unparse");
-Object.defineProperty(exports, "unparse", { enumerable: true, get: function () { return __importDefault(unparse_1).default; } });
+var serialize_1 = require("./serialize");
+Object.defineProperty(exports, "serialize", { enumerable: true, get: function () { return __importDefault(serialize_1).default; } });

package/core/server/services/members/import-export/csv/index.ts

@@ -0,0 +1,2 @@
+export {default as parse, type Row} from './parse';
+export {default as serialize} from './serialize';

package/core/server/services/members/import-export/csv/parse.js

@@ -0,0 +1,64 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = parse;
+const node_stream_1 = require("node:stream");
+const papaparse_1 = __importDefault(require("papaparse"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
+// A column named after an Object.prototype member (toString, __proto__, ...) is unsafe
+// as a key: writing it would shadow a method or reach the prototype.
+function isSafeColumnName(name) {
+    return !(name in Object.prototype);
+}
+// headerMapping renames the CSV's headers to the columns they emit under; unmapped
+// columns carry through under their own name.
+function parse(path, headerMapping) {
+    return new Promise(function (resolve, reject) {
+        const csvFileStream = fs_extra_1.default.createReadStream(path);
+        const csvParserStream = papaparse_1.default.parse(papaparse_1.default.NODE_STREAM_INPUT, {
+            header: true
+        });
+        const rows = [];
+        const parsedCSVStream = (0, node_stream_1.pipeline)(csvFileStream, csvParserStream, (err) => {
+            if (err) {
+                return reject(err);
+            }
+            resolve(rows);
+        });
+        parsedCSVStream.on('data', (parsedRow) => {
+            // a throw here escapes as an uncaught exception and leaves this
+            // promise forever unsettled, so it has to become a rejection
+            try {
+                const row = {};
+                for (const [header, value] of Object.entries(parsedRow)) {
+                    // papaparse gathers the overflow from a row carrying more
+                    // fields than there are headers under __parsed_extra, as an
+                    // array rather than a cell any mapping can name
+                    if (typeof value !== 'string') {
+                        continue;
+                    }
+                    // hasOwn, not `in`: a prototype-named header would otherwise match an
+                    // inherited method on the mapping and take a function as its mapped name.
+                    if (headerMapping && Object.hasOwn(headerMapping, header)) {
+                        row[headerMapping[header]] = value;
+                    }
+                    else if (isSafeColumnName(header)) {
+                        // Carry any unmapped column through untouched, so the import is not
+                        // constrained to a known vocabulary: a custom_fields.* column
+                        // survives parsing even though nothing consumes it yet.
+                        row[header] = value;
+                    }
+                }
+                if (!Object.keys(row).length) {
+                    return;
+                }
+                rows.push(row);
+            }
+            catch (err) {
+                reject(err);
+            }
+        });
+    });
+}

package/core/server/services/members/import-export/csv/parse.ts

@@ -0,0 +1,69 @@
+import {pipeline} from 'node:stream';
+import papaparse from 'papaparse';
+import fs from 'fs-extra';
+
+// A parsed CSV row: raw string cells, keyed by (renamed) column. Parsing is mechanical;
+// giving the columns meaning and coercing their values is the domain's job (the import
+// schema).
+export type Row = Record<string, string>;
+
+// A column named after an Object.prototype member (toString, __proto__, ...) is unsafe
+// as a key: writing it would shadow a method or reach the prototype.
+function isSafeColumnName(name: string): boolean {
+    return !(name in Object.prototype);
+}
+
+// headerMapping renames the CSV's headers to the columns they emit under; unmapped
+// columns carry through under their own name.
+export default function parse(path: string, headerMapping?: Record<string, string>): Promise<Row[]> {
+    return new Promise(function (resolve, reject) {
+        const csvFileStream = fs.createReadStream(path);
+        const csvParserStream = papaparse.parse(papaparse.NODE_STREAM_INPUT, {
+            header: true
+        });
+
+        const rows: Row[] = [];
+        const parsedCSVStream = pipeline(csvFileStream, csvParserStream, (err) => {
+            if (err) {
+                return reject(err);
+            }
+            resolve(rows);
+        });
+
+        parsedCSVStream.on('data', (parsedRow: Record<string, unknown>) => {
+            // a throw here escapes as an uncaught exception and leaves this
+            // promise forever unsettled, so it has to become a rejection
+            try {
+                const row: Row = {};
+
+                for (const [header, value] of Object.entries(parsedRow)) {
+                    // papaparse gathers the overflow from a row carrying more
+                    // fields than there are headers under __parsed_extra, as an
+                    // array rather than a cell any mapping can name
+                    if (typeof value !== 'string') {
+                        continue;
+                    }
+
+                    // hasOwn, not `in`: a prototype-named header would otherwise match an
+                    // inherited method on the mapping and take a function as its mapped name.
+                    if (headerMapping && Object.hasOwn(headerMapping, header)) {
+                        row[headerMapping[header]] = value;
+                    } else if (isSafeColumnName(header)) {
+                        // Carry any unmapped column through untouched, so the import is not
+                        // constrained to a known vocabulary: a custom_fields.* column
+                        // survives parsing even though nothing consumes it yet.
+                        row[header] = value;
+                    }
+                }
+
+                if (!Object.keys(row).length) {
+                    return;
+                }
+
+                rows.push(row);
+            } catch (err) {
+                reject(err);
+            }
+        });
+    });
+}

package/core/server/services/members/import-export/csv/serialize.js

@@ -0,0 +1,13 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = serialize;
+const papaparse_1 = __importDefault(require("papaparse"));
+// The papaparse boundary: given rows already shaped into cells, it writes CSV and
+// nothing else. escapeFormulae is forced on -- papaparse defaults it off, but this CSV
+// is opened by a person, so a leading =, +, -, @ or tab must be escaped.
+function serialize(rows, { columns, header = true } = {}) {
+    return papaparse_1.default.unparse(rows, { columns, header, escapeFormulae: true });
+}

package/core/server/services/members/import-export/csv/serialize.ts

@@ -0,0 +1,18 @@
+import papaparse from 'papaparse';
+
+interface SerializeOptions {
+    // Omitted, papaparse derives the columns (and their order) from the first row's
+    // keys -- so a typed shaper's row can define them, with no separate list to drift.
+    columns?: string[];
+    header?: boolean;
+}
+
+// The papaparse boundary: given rows already shaped into cells, it writes CSV and
+// nothing else. escapeFormulae is forced on -- papaparse defaults it off, but this CSV
+// is opened by a person, so a leading =, +, -, @ or tab must be escaped.
+export default function serialize(
+    rows: Array<Record<string, unknown>>,
+    {columns, header = true}: SerializeOptions = {}
+): string {
+    return papaparse.unparse(rows, {columns, header, escapeFormulae: true});
+}

package/core/server/services/members/import-export/export/exporter.js

@@ -0,0 +1,202 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.toExportCsvRow = toExportCsvRow;
+const moment_1 = __importDefault(require("moment"));
+const node_stream_1 = require("node:stream");
+const logging = require('@tryghost/logging');
+const errors = require('@tryghost/errors');
+const { csvCellsForFields } = require('@tryghost/custom-field-types/csv');
+// The columns the export reads off the members table, checked against MemberDbRow so the
+// query cannot select a column the row type does not declare.
+const MEMBER_COLUMNS = ['id', 'email', 'name', 'note', 'status', 'created_at'];
+function namesToCsv(items) {
+    return items.map(item => item.name).join(',');
+}
+// Encode a flattened export row into its CSV cells, type-checked against MemberExportRow:
+// a change to that row must be handled here or this stops compiling. deleted_at is always
+// null -- the export reads live members -- and complimentary_plan is written from comped.
+function toExportCsvRow(row) {
+    return {
+        id: row.id,
+        email: row.email,
+        name: row.name,
+        note: row.note,
+        subscribed_to_emails: row.subscribed === true ? 'true' : 'false',
+        complimentary_plan: row.comped === true ? 'true' : '',
+        stripe_customer_id: row.stripe_customer_id,
+        created_at: row.created_at,
+        deleted_at: null,
+        labels: namesToCsv(row.labels),
+        tiers: namesToCsv(row.tiers),
+        gift_id: row.gift_id || '',
+        ...row.custom_field_cells
+    };
+}
+const BATCH_SIZE = 1000;
+// Streams the matching members as flat rows, each carrying its related data (tiers,
+// labels, subscription, gift, Stripe customer, custom fields) for the output serializer
+// to turn into CSV lines. The members aggregate and custom fields are reached only
+// through the ports above, so nothing Bookshelf- or flag-shaped leaks into the export.
+class MembersCSVExporter {
+    _knex;
+    _members;
+    _customFields;
+    constructor({ knex, members, customFields }) {
+        this._knex = knex;
+        this._members = members;
+        this._customFields = customFields;
+    }
+    async export(options = {}) {
+        const start = Date.now();
+        const hasFilter = options.limit !== 'all' || options.filter || options.search;
+        const ids = hasFilter ? await this._members.findFilteredIds(options) : null;
+        if (ids) {
+            logging.info(`[MembersExporter] Found ${ids.length} members matching filter criteria`);
+        }
+        const reference = await this.fetchReferenceData();
+        const membersQuery = this._knex('members').select(...MEMBER_COLUMNS);
+        if (ids) {
+            membersQuery.whereIn('id', ids);
+        }
+        logging.info('[MembersExporter] Starting streaming export of members');
+        const batchingTransform = this.createBatchingTransform();
+        const processingTransform = this.createProcessingTransform(reference);
+        (0, node_stream_1.pipeline)(membersQuery.stream(), batchingTransform, processingTransform, (err) => {
+            if (err) {
+                logging.error({ event: { name: 'members-export.stream.error' }, err }, 'Members export stream failed');
+            }
+            else {
+                logging.info('[MembersExporter] Total time taken for member export: ' + (Date.now() - start) / 1000 + 's');
+            }
+        });
+        return processingTransform;
+    }
+    // products and labels are small, stable tables, read once up front as id->name
+    // maps. Custom field definitions are read once too, which fixes the column set for
+    // the whole file: archiving a field mid-export cannot leave the header ragged. It
+    // can still leave that field's cells empty from the batch after the archive
+    // onwards, because the per-batch value read applies its own active filter.
+    async fetchReferenceData() {
+        const start = Date.now();
+        const allProducts = await this._knex('products').select('id', 'name').then(rows => rows.reduce((acc, product) => {
+            acc[product.id] = product.name;
+            return acc;
+        }, {}));
+        const allLabels = await this._knex('labels').select('id', 'name').then(rows => rows.reduce((acc, label) => {
+            acc[label.id] = label.name;
+            return acc;
+        }, {}));
+        logging.info('[MembersExporter] Fetched products and labels in ' + (Date.now() - start) + 'ms');
+        const activeCustomFields = await this._customFields.activeDefinitions();
+        return { allProducts, allLabels, activeCustomFields };
+    }
+    // Group the member stream into batches so the related-data reads are one query per
+    // batch rather than one per member.
+    createBatchingTransform() {
+        let currentBatch = [];
+        return new node_stream_1.Transform({
+            objectMode: true,
+            transform(member, encoding, callback) {
+                currentBatch.push(member);
+                if (currentBatch.length >= BATCH_SIZE) {
+                    this.push(currentBatch);
+                    currentBatch = [];
+                }
+                callback();
+            },
+            flush(callback) {
+                if (currentBatch.length > 0) {
+                    this.push(currentBatch);
+                }
+                callback();
+            }
+        });
+    }
+    // Each flattened row is pushed individually so a batch's rows do not pile up in memory.
+    createProcessingTransform(reference) {
+        const assembleRelatedData = (memberIds) => this.assembleRelatedData(memberIds, reference.activeCustomFields);
+        const flattenBatch = (members, related) => this.flattenBatch(members, related, reference);
+        return new node_stream_1.Transform({
+            objectMode: true,
+            highWaterMark: BATCH_SIZE,
+            async transform(batch, encoding, callback) {
+                try {
+                    const memberIds = batch.map(member => member.id);
+                    const related = await assembleRelatedData(memberIds);
+                    const rows = flattenBatch(batch, related);
+                    rows.forEach(row => this.push(row));
+                    callback();
+                }
+                catch (err) {
+                    callback(err instanceof Error ? err : new errors.InternalServerError({ message: String(err) }));
+                }
+            }
+        });
+    }
+    // One query per related table for the whole batch, not one per member. Custom field
+    // values are read only when there are columns to fill.
+    async assembleRelatedData(memberIds, activeCustomFields) {
+        const knex = this._knex;
+        const [tiers, labels, stripeCustomers, subscriptions, gifts, customFieldValuesMap] = await Promise.all([
+            knex('members_products')
+                .select('member_id', knex.raw('GROUP_CONCAT(product_id) as tiers'))
+                .whereIn('member_id', memberIds)
+                .groupBy('member_id'),
+            knex('members_labels')
+                .select('member_id', knex.raw('GROUP_CONCAT(label_id) as labels'))
+                .whereIn('member_id', memberIds)
+                .groupBy('member_id'),
+            knex('members_stripe_customers')
+                .select('member_id', knex.raw('MIN(customer_id) as stripe_customer_id'))
+                .whereIn('member_id', memberIds)
+                .groupBy('member_id'),
+            knex('members_newsletters')
+                .distinct('member_id')
+                .whereIn('member_id', memberIds),
+            knex('gifts')
+                .select('id', 'redeemer_member_id')
+                .where('status', 'redeemed')
+                .whereIn('redeemer_member_id', memberIds),
+            activeCustomFields.length > 0
+                ? this._customFields.valuesForMembers(memberIds)
+                : new Map()
+        ]);
+        return {
+            tiersMap: new Map(tiers.map((row) => [row.member_id, row.tiers])),
+            labelsMap: new Map(labels.map((row) => [row.member_id, row.labels])),
+            stripeCustomerMap: new Map(stripeCustomers.map((row) => [row.member_id, row.stripe_customer_id])),
+            subscribedSet: new Set(subscriptions.map((row) => row.member_id)),
+            giftIdMap: new Map(gifts.map((row) => [row.redeemer_member_id, row.id])),
+            customFieldValuesMap
+        };
+    }
+    flattenBatch(members, related, reference) {
+        const { tiersMap, labelsMap, stripeCustomerMap, subscribedSet, giftIdMap, customFieldValuesMap } = related;
+        const { allProducts, allLabels, activeCustomFields } = reference;
+        return members.map((row) => {
+            const tierConcat = tiersMap.get(row.id);
+            const tierIds = tierConcat ? tierConcat.split(',') : [];
+            const labelConcat = labelsMap.get(row.id);
+            const labelIds = labelConcat ? labelConcat.split(',') : [];
+            return {
+                ...row,
+                subscribed: subscribedSet.has(row.id),
+                comped: row.status === 'comped',
+                gift_id: giftIdMap.get(row.id) || null,
+                stripe_customer_id: stripeCustomerMap.get(row.id) || null,
+                created_at: (0, moment_1.default)(row.created_at).toISOString(),
+                tiers: tierIds.map(id => ({ name: allProducts[id] })),
+                labels: labelIds.map(id => ({ name: allLabels[id] })),
+                // Flattened here rather than in the serializer because the column set is
+                // only knowable from the database. Every member carries a cell for every
+                // active field's column, so a member with no values still contributes the
+                // full set -- the CSV header is taken from whichever row streams first.
+                custom_field_cells: csvCellsForFields(activeCustomFields, customFieldValuesMap.get(row.id) || {})
+            };
+        });
+    }
+}
+exports.default = MembersCSVExporter;