ghost 6.58.0 → 6.59.0

package/core/server/services/content-import/import/post-data.js

@@ -0,0 +1,52 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RowSkipped = void 0;
+exports.default = buildPostData;
+const row_1 = require("./row");
+const { slugify } = require('@tryghost/string');
+// A malformed row, refused before any write was attempted; distinct from a write
+// that failed, which the importer records separately.
+class RowSkipped extends Error {
+    constructor(reason) {
+        super(reason);
+        this.name = 'RowSkipped';
+    }
+}
+exports.RowSkipped = RowSkipped;
+function buildPostData(row, htmlToLexical, importTagNames) {
+    const check = row_1.importableRowSchema.safeParse(row);
+    if (!check.success) {
+        throw new RowSkipped(check.error.issues[0].message);
+    }
+    const data = {
+        title: row.title,
+        // Slugified here with the standard rules: left to the model, the
+        // importing-context slug pass keeps every punctuation dash
+        // (slugify requiredChangesOnly).
+        slug: slugify(row.title),
+        // Explicit rather than left to the model, which would default status to draft and
+        // visibility to the default_content_visibility setting. Never 'scheduled': the
+        // post scheduler has no importing check.
+        status: 'published',
+        type: 'post',
+        visibility: 'public',
+        // The # prefix gives the batch tags internal visibility.
+        tags: importTagNames.map(name => ({ name }))
+    };
+    if (row.html) {
+        try {
+            data.lexical = JSON.stringify(htmlToLexical(row.html));
+        }
+        catch {
+            throw new RowSkipped('html could not be converted');
+        }
+    }
+    // The one date column dates the whole post; preserved only because the write runs
+    // under options.importing, which stops the model stamping its own timestamps.
+    if (row.published_at) {
+        data.published_at = row.published_at;
+        data.created_at = row.published_at;
+        data.updated_at = row.published_at;
+    }
+    return data;
+}

package/core/server/services/content-import/import/reader.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = readPostRows;
+const csv_1 = require("../csv");
+const row_1 = require("./row");
+// Identity map until the field-mapping milestone adds caller-supplied mappings.
+const FIELD_BY_HEADER = {
+    title: 'title',
+    html: 'html',
+    published_at: 'published_at'
+};
+async function readPostRows(path) {
+    const rows = await (0, csv_1.parse)(path, FIELD_BY_HEADER);
+    return rows.map(row => row_1.postImportRowSchema.parse(row));
+}

package/core/server/services/content-import/import/row.js

@@ -0,0 +1,50 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.importableRowSchema = exports.postImportRowSchema = void 0;
+const zod_1 = require("zod");
+const temporal_polyfill_1 = require("temporal-polyfill");
+// An empty cell (or the literal 'undefined') reads as absent, not as a value.
+const optionalCell = zod_1.z.string()
+    .transform(cell => (cell === '' || cell === 'undefined' ? undefined : cell))
+    .optional();
+// title is trimmed here because the model's own trim is skipped under
+// options.importing; unknown columns pass through (.loose()) for field mapping.
+exports.postImportRowSchema = zod_1.z.object({
+    title: zod_1.z.string().default('').transform(cell => cell.trim()),
+    html: zod_1.z.string().default(''),
+    published_at: optionalCell
+}).loose();
+// Validation for coerced rows; buildPostData turns the first issue into a row
+// skip. A blank title is refused because the model's (Untitled) fallback is
+// skipped under options.importing; an invalid date is refused rather than
+// silently replaced with the import time (what the JSON importer does). The
+// title cap matches the posts schema's isLength validation.
+exports.importableRowSchema = zod_1.z.object({
+    title: zod_1.z.string()
+        .min(1, 'title is required')
+        .max(255, 'title must be 255 characters or fewer')
+}).loose().superRefine((row, ctx) => {
+    const publishedAt = row.published_at;
+    if (typeof publishedAt === 'string' && !isValidDate(publishedAt)) {
+        ctx.addIssue({ code: 'custom', message: `published_at is not a valid date: "${publishedAt}"` });
+    }
+});
+// new Date() alone is not enough: it normalizes rolled-over calendar dates, so
+// 2025-02-30 silently becomes March 2. For ISO-shaped values the calendar components
+// are checked strictly with Temporal; other formats stay as loose as new Date().
+function isValidDate(value) {
+    if (Number.isNaN(new Date(value).getTime())) {
+        return false;
+    }
+    const isoDate = /^(\d{4})-(\d{2})-(\d{2})/.exec(value);
+    if (!isoDate) {
+        return true;
+    }
+    try {
+        temporal_polyfill_1.Temporal.PlainDate.from({ year: Number(isoDate[1]), month: Number(isoDate[2]), day: Number(isoDate[3]) }, { overflow: 'reject' });
+        return true;
+    }
+    catch {
+        return false;
+    }
+}

package/core/server/services/content-import/import/store.js

@@ -0,0 +1,71 @@
+"use strict";
+// The in-memory record of what a content import did: one run per upload, one
+// outcome per row. Nothing is persisted; the durable job system milestone
+// replaces this.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ImportRunStore = void 0;
+// Both bounds are applied lazily on create() so no timer keeps the process alive.
+const MAX_RUNS = 10;
+const MAX_RUN_AGE_MS = 60 * 60 * 1000;
+class ImportRunStore {
+    // Insertion-ordered, so count-eviction drops the oldest run first.
+    _runs = new Map();
+    _now;
+    constructor({ now = () => new Date() } = {}) {
+        this._now = now;
+    }
+    create(id, total) {
+        this.evict();
+        const run = {
+            id,
+            status: 'running',
+            startedAt: this._now(),
+            total,
+            rows: []
+        };
+        this._runs.set(id, run);
+        return run;
+    }
+    record(id, outcome) {
+        this._runs.get(id)?.rows.push(outcome);
+    }
+    finish(id) {
+        const run = this._runs.get(id);
+        if (run) {
+            run.status = 'complete';
+            run.finishedAt = this._now();
+        }
+    }
+    fail(id, reason) {
+        const run = this._runs.get(id);
+        if (run) {
+            run.status = 'failed';
+            run.failureReason = reason;
+            run.finishedAt = this._now();
+        }
+    }
+    get(id) {
+        return this._runs.get(id);
+    }
+    // A running run is never evicted, whatever its age: the job holds only the runId,
+    // so evicting mid-import would silently turn its record()/finish() calls into
+    // no-ops and lose the report. The count cap can briefly overshoot while several
+    // imports run at once; the inline job queue bounds how many that can be.
+    evict() {
+        const cutoff = this._now().getTime() - MAX_RUN_AGE_MS;
+        for (const [id, run] of this._runs) {
+            const lastTouched = (run.finishedAt ?? run.startedAt).getTime();
+            if (run.status !== 'running' && lastTouched < cutoff) {
+                this._runs.delete(id);
+            }
+        }
+        while (this._runs.size >= MAX_RUNS) {
+            const oldestEvictable = [...this._runs.values()].find(run => run.status !== 'running');
+            if (!oldestEvictable) {
+                break;
+            }
+            this._runs.delete(oldestEvictable.id);
+        }
+    }
+}
+exports.ImportRunStore = ImportRunStore;

package/core/server/services/content-import/index.js

@@ -0,0 +1,67 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.init = init;
+exports.importCSV = importCSV;
+const zod_1 = require("zod");
+const importer_1 = __importDefault(require("./import/importer"));
+const reader_1 = __importDefault(require("./import/reader"));
+const store_1 = require("./import/store");
+// The request is built from HTTP upload metadata, so it is validated at the
+// service boundary rather than trusted.
+const importRequestSchema = zod_1.z.object({ filePath: zod_1.z.string().min(1) });
+// A junk timezone setting falls back to UTC rather than mis-stamping the batch tag.
+const timezoneSchema = zod_1.z.string().min(1).catch('Etc/UTC');
+const errors = require('@tryghost/errors');
+const logging = require('@tryghost/logging');
+const sentry = require('../../../shared/sentry');
+// Composition root: models and services are wired behind the collaborators the
+// importer declares.
+function makeImporter() {
+    // Required lazily: boot initialises this service before the model and job layers
+    // are guaranteed loaded.
+    const models = require('../../models');
+    const lexicalLib = require('../../lib/lexical');
+    const jobsService = require('../jobs');
+    const settingsCache = require('../../../shared/settings-cache');
+    const urlService = require('../url');
+    const ObjectID = require('bson-objectid').default;
+    // Inline jobs never reach the job manager's Sentry handler, which is wired to the
+    // offloaded worker path only, so a throw here would be seen by nobody.
+    const report = (error) => {
+        try {
+            logging.error({ event: { name: 'content.import.error' }, err: error }, 'Content import failure');
+            sentry.captureException(error);
+        }
+        catch {
+            // Callers report from catch blocks, so this must not throw.
+        }
+    };
+    return new importer_1.default({
+        readRows: reader_1.default,
+        posts: {
+            create: (data, options) => models.Post.add(data, options)
+        },
+        getHtmlToLexical: () => lexicalLib.htmlToLexicalConverter,
+        addJob: jobsService.addJob.bind(jobsService),
+        report,
+        store: new store_1.ImportRunStore(),
+        // Degrades to the 404 URL for a post the URL service cannot route yet (e.g. a draft).
+        urlForPost: post => urlService.getUrlForResource({ ...post.toJSON(), type: 'posts' }, { absolute: true }),
+        newRunId: () => new ObjectID().toHexString(),
+        getTimezone: () => timezoneSchema.parse(settingsCache.get('timezone'))
+    });
+}
+let importer;
+// Idempotent because tests may boot more than once per process.
+function init() {
+    importer ??= makeImporter();
+}
+function importCSV(request) {
+    if (!importer) {
+        throw new errors.InternalServerError({ message: 'Content import service used before init' });
+    }
+    return importer.importCSV(importRequestSchema.parse(request));
+}

package/core/server/services/email-analytics/automation-email-analytics-batch-processor.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AutomationEmailAnalyticsBatchProcessor = void 0;
-const mailgun_message_id_1 = require("../automations/mailgun-message-id");
+const mailgun_message_id_1 = require("../lib/mailgun-message-id");
 const event_processing_result_1 = require("./event-processing-result");
 const getMailgunMessageIds = (events) => {
     const result = new Set();

package/core/server/services/email-analytics/index.js

@@ -8,6 +8,8 @@ const email_analytics_service_wrapper_1 = require("./email-analytics-service-wra
 // @ts-expect-error This module lacks type definitions.
 const newsletter_email_analytics_batch_processor_1 = require("./newsletter-email-analytics-batch-processor");
 // @ts-expect-error This module lacks type definitions.
+const newsletter_email_analytics_batch_processor_2 = require("./newsletter-email-analytics-batch-processor");
+// @ts-expect-error This module lacks type definitions.
 const newsletter_email_event_storage_1 = __importDefault(require("../email-service/newsletter-email-event-storage"));
 // @ts-expect-error This module lacks type definitions.
 const email_event_processor_1 = __importDefault(require("../email-service/email-event-processor"));
@@ -71,7 +73,7 @@ const init = ({ automationsApi, config, db, domainEvents, emailSuppressionList,
         },
         metrics,
         settingsCache,
-        createEventProcessor: () => (new newsletter_email_analytics_batch_processor_1.NewsletterEmailAnalyticsBatchProcessor({
+        createEventProcessor: () => (new newsletter_email_analytics_batch_processor_2.NewsletterEmailAnalyticsBatchProcessor({
             config,
             emailEventProcessor: newsletterEmailEventProcessor,
             prometheusClient,

package/core/server/services/email-analytics/jobs/index.js

@@ -14,7 +14,7 @@ const emailAnalyticsJobScheduler = new EmailAnalyticsJobScheduler({
  * @returns {Promise<void>}
  */
 exports.scheduleRecurringNewslettersJob = async (...args) => {
-    if (!process.env.NODE_ENV.startsWith('test')) {
+    if (!process.env.NODE_ENV?.startsWith('test')) {
         await emailAnalyticsJobScheduler.scheduleRecurringNewslettersJob(...args);
     }
 };
@@ -24,7 +24,7 @@ exports.scheduleRecurringNewslettersJob = async (...args) => {
  * @returns {Promise<void>}
  */
 exports.scheduleRecurringAutomationsJob = async (...args) => {
-    if (!process.env.NODE_ENV.startsWith('test')) {
+    if (!process.env.NODE_ENV?.startsWith('test')) {
         await emailAnalyticsJobScheduler.scheduleRecurringAutomationsJob(...args);
     }
 };

package/core/server/services/email-service/email-service-wrapper.js

@@ -136,7 +136,7 @@ class EmailServiceWrapper {
         });
 
         if (ghostServer) {
-            ghostServer.registerCleanupTask(() => batchSendingService.onShutdown());
+            ghostServer.registerCleanupTask(() => batchSendingService.onShutdown(), 'Email batch sending');
         }
 
         this.renderer = emailRenderer;

package/core/server/services/email-suppression-list/email-suppression-list.js

@@ -63,7 +63,8 @@ class AbstractEmailSuppressionList {
      * @param {string} email
      * @returns {Promise<boolean>}
      */
-    async removeEmail(email) { // eslint-disable-line
+    // eslint-disable-next-line
+    async removeEmail(email) {
         return Promise.reject();
     }
 
@@ -71,7 +72,8 @@ class AbstractEmailSuppressionList {
      * @param {string} email
      * @returns {Promise<EmailSuppressionData>}
      */
-    async getSuppressionData(email) { // eslint-disable-line
+    // eslint-disable-next-line
+    async getSuppressionData(email) {
         return Promise.reject();
     }
 

package/core/server/services/gifts/CONTEXT.md

@@ -14,6 +14,10 @@ _Avoid_: Purchaser, recipient, redeemer
 The member who claims a gift subscription and receives its access. The redeemer is determined at redemption, not purchase.
 _Avoid_: Recipient, buyer
 
+**Recipient**:
+The person for whom a gift subscription is intended. Their email routes delivery but does not reserve redemption; they need not be a member and do not become the redeemer until they claim the gift.
+_Avoid_: Receiver, redeemer
+
 ### Purchase and claim
 
 **Gift subscription**:
@@ -21,17 +25,37 @@ A prepaid, non-renewing entitlement to one membership tier for a fixed period. I
 _Avoid_: Gift membership, recurring subscription
 
 **Gift purchase**:
-A one-time purchase that creates a gift subscription for the buyer to share.
+A one-time purchase that creates a gift subscription for the buyer to share. Completing a gift purchase does not mean that an emailed gift has been sent.
 _Avoid_: Gift checkout
 
+**Delivery method**:
+The buyer's chosen way of handing over a gift subscription: the publication emails it to a recipient, or the buyer shares the redemption link privately.
+_Avoid_: Delivery mode
+
 **Redemption link**:
-A single-use, time-limited link through which a purchased gift subscription can be claimed.
+A single-use, time-limited link through which a purchased gift subscription can be viewed and claimed. Its bearer may see the gift's buyer name, intended recipient name, and personal message, but not email-routing or delivery details.
 _Avoid_: Gift Link
 
 **Gift redemption**:
 The act of claiming an eligible gift subscription. The member who claims it becomes the redeemer and gifted access begins at that point.
 _Avoid_: Gift activation
 
+**Gift delivery**:
+Communicating a gift subscription's redemption link to its recipient by email. Delivery does not claim the gift or begin gifted access.
+_Avoid_: Gift redemption, gift activation
+
+**Personal message**:
+A note from the buyer that forms part of the gift and can be presented wherever the gift is shown, including email and redemption experiences.
+_Avoid_: Delivery message, email message
+
+**Gift sent**:
+The recipient email has been accepted by the publication's configured mail transport. This completes gift delivery.
+_Avoid_: Gift delivered, provider delivery
+
+**Email delivery status**:
+The current progress of handing a recipient email to the configured mail transport: pending, sending, sent, failed, or cancelled.
+_Avoid_: Gift status
+
 ### Time and lifecycle
 
 **Gift duration**:
@@ -43,7 +67,7 @@ The monthly or yearly membership price basis used to value a gift subscription.
 _Avoid_: Gift duration, renewal interval
 
 **Gift expiration**:
-The end of the claim window for a purchased gift subscription that was never redeemed.
+The end of the claim window that begins when a gift subscription is purchased and was never redeemed.
 _Avoid_: Gift consumption
 
 **Gift consumption**:

package/core/server/services/gifts/README.md

@@ -20,9 +20,13 @@ transactions, or Stripe objects.
 - `getMemberPresentations(memberIds)`, `getPreview(token)`,
   `browsePurchaseEvents(...)`, and `browseRedemptionEvents(...)` expose
   stable read models.
-- `processReminders()`, `processConsumed()`, and `processExpired()` own due
-  lifecycle work; scheduler and HTTP triggers remain adapters.
+- `processReminders()`, `processConsumed()`, and `processExpired()` own gift
+  lifecycle work. `GiftDeliveryService` owns email-delivery creation,
+  post-commit dispatch, cancellation, and processing behind a separate
+  interface. Email delivery starts immediately after purchase through an
+  in-process event. Delivery claims are atomic; stale in-progress claims are
+  retried after a crash, so mail-transport acceptance is at least once.
 - `reassignRedeemer(...)` is the import capability.
 
-The `Gift`, repository, Bookshelf query, Stripe checkout, email, scheduling,
-and notification collaborators are internal adapters.
+The `Gift` model, gift-delivery data schema, their repositories, Bookshelf
+queries, Stripe checkout and email collaborators are internal adapters.

package/core/server/services/gifts/constants.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.GIFT_REMINDER_FLOOR_DAYS = exports.GIFT_REMINDER_LEAD_DAYS = exports.GIFT_EXPIRY_DAYS = void 0;
+exports.GIFT_DELIVERY_STALE_AFTER_MS = exports.GIFT_REMINDER_FLOOR_DAYS = exports.GIFT_REMINDER_LEAD_DAYS = exports.GIFT_EXPIRY_DAYS = void 0;
 exports.GIFT_EXPIRY_DAYS = 365;
 exports.GIFT_REMINDER_LEAD_DAYS = 7;
 exports.GIFT_REMINDER_FLOOR_DAYS = 3;
+exports.GIFT_DELIVERY_STALE_AFTER_MS = 60 * 60 * 1000;

package/core/server/services/gifts/email-templates/gift-delivery.hbs

@@ -0,0 +1,20 @@
+<!doctype html>
+<html>
+  <head><meta name="viewport" content="width=device-width"><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>{{t 'A gift, just for you'}}</title></head>
+  <body style="background:#fff;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,Helvetica,Arial,sans-serif;margin:0;padding:0;color:#3A464C;">
+    <span class="preheader" style="color:transparent;display:none;height:0;max-height:0;max-width:0;opacity:0;overflow:hidden;visibility:hidden;width:0;">{{t 'You\'ve been gifted a membership to {siteTitle}' siteTitle=siteTitle}}</span>
+    <table role="presentation" width="100%" cellpadding="0" cellspacing="0" border="0"><tr><td align="center">
+      <table role="presentation" width="540" cellpadding="0" cellspacing="0" border="0" style="max-width:540px;width:100%;"><tr><td style="padding:40px 20px;">
+        {{#if siteIconUrl}}<a href="{{siteUrl}}"><img src="{{siteIconUrl}}" alt="{{siteTitle}}" width="48" height="48" style="border-radius:4px;"></a>{{else}}<a href="{{siteUrl}}" style="color:{{accentColor}};font-size:17px;font-weight:700;text-decoration:none;">{{siteTitle}}</a>{{/if}}
+        <h1 style="color:#15212A;font-size:26px;line-height:31px;margin:22px 0 14px;">{{t 'A gift, just for you'}}</h1>
+        {{#if recipientName}}<p style="font-size:16px;line-height:24px;margin:0 0 16px;">{{t 'Hi {recipientName},' recipientName=(strong recipientName)}}</p>{{/if}}
+        <p style="font-size:16px;line-height:24px;margin:0 0 24px;">{{#if gift.isMonthly}}{{t '{buyerName} has gifted you a {duration}-month {tierName} membership to {siteTitle}' buyerName=(strong buyerName) duration=(strong gift.duration) count=gift.duration tierName=(strong gift.tierName) siteTitle=siteTitle}}{{else}}{{t '{buyerName} has gifted you a {duration}-year {tierName} membership to {siteTitle}' buyerName=(strong buyerName) duration=(strong gift.duration) count=gift.duration tierName=(strong gift.tierName) siteTitle=siteTitle}}{{/if}}</p>
+        {{#if personalMessage}}<div style="background:{{accentTint}};border-radius:8px;margin-bottom:24px;padding:16px 18px;"><p style="color:#15212A;font-size:16px;font-style:italic;line-height:24px;margin:0;white-space:pre-line;word-break:break-word;">{{personalMessage}}</p><p style="color:{{accentShade}};font-size:14px;margin:10px 0 0;">{{buyerName}}</p></div>{{/if}}
+        {{#if gift.benefits.length}}<table role="presentation" width="100%" cellpadding="0" cellspacing="0" border="0" style="margin-bottom:32px;"><tr><td><p style="font-size:16px;line-height:24px;margin:0 0 6px;">{{t 'What\'s included'}}</p></td></tr>{{#each gift.benefits}}<tr><td style="font-size:16px;line-height:24px;padding:4px 0;"><span style="color:{{../accentColor}};font-weight:bold;">&#10003;</span>&nbsp;&nbsp;{{this}}</td></tr>{{/each}}</table>{{/if}}
+        <a href="{{gift.link}}" style="background:{{accentColor}};border-radius:5px;color:#fff;display:block;font-size:16px;padding:10px 22px;text-align:center;text-decoration:none;">{{t 'Redeem your gift:'}}</a>
+        <p style="color:#738A94;font-size:13px;line-height:20px;margin:16px 0 0;">{{t 'This gift can only be redeemed once and expires on {expiresAt}.' expiresAt=(strong gift.expiresAt)}}</p>
+        <p style="color:#738A94;font-size:11px;line-height:16px;margin:40px 0 0;">{{t 'This message was sent from {siteDomain} to {email} on behalf of {buyerName} ({buyerEmail}).' siteDomain=(linkTag siteUrl siteDomain style="color:#738A94;") email=(linkTag (mailto toEmail) toEmail style="color:#738A94;") buyerName=buyerName buyerEmail=(linkTag (mailto buyerEmail) buyerEmail style="color:#738A94;")}}</p>
+      </td></tr></table>
+    </td></tr></table>
+  </body>
+</html>

package/core/server/services/gifts/email-templates/gift-delivery.js

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.renderText = renderText;
+function renderText(data, t) {
+    const interpolation = { escapeValue: false };
+    const greeting = data.recipientName ? `${t('Hi {recipientName},', {
+        recipientName: data.recipientName,
+        interpolation
+    })}\n\n` : '';
+    const giftDescription = {
+        duration: data.gift.duration,
+        count: data.gift.duration,
+        tierName: data.gift.tierName,
+        siteTitle: data.siteTitle
+    };
+    const intro = data.gift.isMonthly
+        ? t('{buyerName} has gifted you a {duration}-month {tierName} membership to {siteTitle}', {
+            ...giftDescription,
+            buyerName: data.buyerName,
+            interpolation
+        })
+        : t('{buyerName} has gifted you a {duration}-year {tierName} membership to {siteTitle}', {
+            ...giftDescription,
+            buyerName: data.buyerName,
+            interpolation
+        });
+    const message = data.personalMessage ? `\n"${data.personalMessage}"\n— ${data.buyerName}\n` : '';
+    const benefits = data.gift.benefits.length ? `\n${t('What\'s included:')}\n${data.gift.benefits.map(benefit => `- ${benefit}`).join('\n')}\n` : '';
+    return `${t('A gift, just for you')}\n\n${greeting}${intro}\n${message}${benefits}\n${t('Redeem your gift:')}\n${data.gift.link}\n\n${t('This gift can only be redeemed once and expires on {expiresAt}.', {
+        expiresAt: data.gift.expiresAt,
+        interpolation
+    })}\n\n---\n${t('This message was sent from {siteDomain} to {email} on behalf of {buyerName} ({buyerEmail}).', {
+        siteDomain: data.siteDomain,
+        email: data.toEmail,
+        buyerName: data.buyerName,
+        buyerEmail: data.buyerEmail,
+        interpolation
+    })}`;
+}

package/core/server/services/gifts/email-templates/gift-purchase-confirmation.hbs

@@ -39,8 +39,8 @@
                     {{/if}}
                     <tr>
                       <td style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 14px; vertical-align: top;">
-                        <h1 style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 26px; color: #15212A; font-weight: bold; line-height: 28px; margin: 0; padding-bottom: 16px;">{{t 'Your gift is ready'}}</h1>
-                        <p style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 16px; color: #3A464C; font-weight: normal; line-height: 24px; margin: 0; padding-bottom: 24px;">{{t 'Thank you for your support. Share the link below with whoever you\'d like to gift them a {cadenceLabel} {tierName} membership to {siteTitle}.' cadenceLabel=(strong gift.cadenceLabel) tierName=(strong gift.tierName) siteTitle=siteTitle}}</p>
+                        <h1 style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 26px; color: #15212A; font-weight: bold; line-height: 28px; margin: 0; padding-bottom: 16px;">{{#if gift.recipientEmail}}{{t 'Your gift is on its way'}}{{else}}{{t 'Your gift is ready'}}{{/if}}</h1>
+                        <p style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 16px; color: #3A464C; font-weight: normal; line-height: 24px; margin: 0; padding-bottom: 24px;">{{#if gift.recipientEmail}}{{#if gift.isMonthly}}{{t 'Thank you for your support. Your gift — a {duration}-month {tierName} membership to {siteTitle} — is on its way to {recipientEmail}. You can also share the link below yourself.' duration=(strong gift.duration) count=gift.duration tierName=(strong gift.tierName) siteTitle=siteTitle recipientEmail=(strong gift.recipientEmail)}}{{else}}{{t 'Thank you for your support. Your gift — a {duration}-year {tierName} membership to {siteTitle} — is on its way to {recipientEmail}. You can also share the link below yourself.' duration=(strong gift.duration) count=gift.duration tierName=(strong gift.tierName) siteTitle=siteTitle recipientEmail=(strong gift.recipientEmail)}}{{/if}}{{else}}{{#if gift.isMonthly}}{{t 'Thank you for your support. Share the link below with whoever you\'d like to gift them a {duration}-month {tierName} membership to {siteTitle}.' duration=(strong gift.duration) count=gift.duration tierName=(strong gift.tierName) siteTitle=siteTitle}}{{else}}{{t 'Thank you for your support. Share the link below with whoever you\'d like to gift them a {duration}-year {tierName} membership to {siteTitle}.' duration=(strong gift.duration) count=gift.duration tierName=(strong gift.tierName) siteTitle=siteTitle}}{{/if}}{{/if}}</p>
                         <table width="100%" border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; table-layout: fixed; width: 100%; min-width: 100%; box-sizing: border-box; background: #F4F5F6; border-radius: 6px;">
                           <tbody>
                             <tr>

package/core/server/services/gifts/email-templates/gift-purchase-confirmation.js

@@ -2,13 +2,28 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.renderText = renderText;
 function renderText(data, t) {
-    const intro = t('Thank you for your support. Share the link below with whoever you\'d like to gift them a {cadenceLabel} {tierName} membership to {siteTitle}.', {
-        cadenceLabel: data.gift.cadenceLabel,
+    const giftDescription = {
+        duration: data.gift.duration,
+        count: data.gift.duration,
         tierName: data.gift.tierName,
         siteTitle: data.siteTitle,
         interpolation: { escapeValue: false }
-    });
-    return `${t('Your gift is ready')}
+    };
+    const intro = data.gift.recipientEmail
+        ? data.gift.isMonthly
+            ? t('Thank you for your support. Your gift — a {duration}-month {tierName} membership to {siteTitle} — is on its way to {recipientEmail}. You can also share the link below yourself.', {
+                ...giftDescription,
+                recipientEmail: data.gift.recipientEmail
+            })
+            : t('Thank you for your support. Your gift — a {duration}-year {tierName} membership to {siteTitle} — is on its way to {recipientEmail}. You can also share the link below yourself.', {
+                ...giftDescription,
+                recipientEmail: data.gift.recipientEmail
+            })
+        : data.gift.isMonthly
+            ? t('Thank you for your support. Share the link below with whoever you\'d like to gift them a {duration}-month {tierName} membership to {siteTitle}.', giftDescription)
+            : t('Thank you for your support. Share the link below with whoever you\'d like to gift them a {duration}-year {tierName} membership to {siteTitle}.', giftDescription);
+    const heading = data.gift.recipientEmail ? t('Your gift is on its way') : t('Your gift is ready');
+    return `${heading}
 
 ${intro}
 

package/core/server/services/gifts/events/send-gift-delivery-event.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SendGiftDeliveryEvent = void 0;
+class SendGiftDeliveryEvent {
+    data;
+    timestamp;
+    constructor(data, timestamp) {
+        this.data = data;
+        this.timestamp = timestamp;
+    }
+    static create(data, timestamp = new Date()) {
+        return new SendGiftDeliveryEvent(data, timestamp);
+    }
+}
+exports.SendGiftDeliveryEvent = SendGiftDeliveryEvent;

package/core/server/services/gifts/gift-bookshelf-repository.js

@@ -7,10 +7,13 @@ exports.GiftBookshelfRepository = void 0;
 const errors_1 = __importDefault(require("@tryghost/errors"));
 const mongo_utils_1 = require("@tryghost/mongo-utils");
 const gift_codec_1 = require("./gift-codec");
+const db_date_1 = require("../../lib/db-date");
 class GiftBookshelfRepository {
     model;
-    constructor({ GiftModel }) {
+    knex;
+    constructor({ GiftModel, knex }) {
         this.model = GiftModel;
+        this.knex = knex;
     }
     async existsByCheckoutSessionId(checkoutSessionId) {
         const existing = await this.model.findOne({
@@ -111,8 +114,19 @@ class GiftBookshelfRepository {
         });
         return collection.models.map(model => this.toGift(model));
     }
+    async deleteAbandonedCheckouts(cutoff) {
+        return this.knex('gifts')
+            .where({ status: 'payment_pending' })
+            .where('checkout_started_at', '<=', (0, db_date_1.toDatabaseDate)(cutoff))
+            .del();
+    }
     async create(gift, options = {}) {
-        await this.model.add(this.toRow(gift), options);
+        const created = await this.model.add(this.toRow(gift), options);
+        const id = created.toJSON().id;
+        if (!id) {
+            throw new errors_1.default.InternalServerError({ message: 'Created gift is missing an id' });
+        }
+        return id;
     }
     async update(gift, options = {}) {
         const existing = await this.model.findOne({
@@ -128,6 +142,12 @@ class GiftBookshelfRepository {
             ...options
         });
     }
+    async deletePendingCheckout(id) {
+        const deleted = await this.knex('gifts')
+            .where({ id, status: 'payment_pending' })
+            .del();
+        return deleted === 1;
+    }
     async transaction(callback) {
         return await this.model.transaction(callback);
     }
@@ -144,7 +164,7 @@ class GiftBookshelfRepository {
         const queryOptions = {
             ...options,
             withRelated: [relation, 'tier'],
-            filter: `${memberIdColumn}:-null+custom:true`,
+            filter: `${memberIdColumn}:-null+${dateColumn}:-null+custom:true`,
             useBasicCount: true,
             mongoTransformer: (0, mongo_utils_1.chainTransformers)(replaceCustomFilter, ...(0, mongo_utils_1.mapKeys)({
                 'data.created_at': dateColumn,

package/core/server/services/gifts/gift-checkout-adapter.js

@@ -48,12 +48,14 @@ module.exports = class GiftCheckoutAdapter {
     }
 
     async createSession(data) {
-        const {customerId, ...sessionData} = data;
+        const {customerId, idempotencyKey, ...sessionData} = data;
         const session = await this.getStripeApi().createGiftCheckoutSession({
             ...sessionData,
-            customer: customerId ? {id: customerId} : null
+            customer: customerId ? {id: customerId} : null,
+            idempotencyKey
         });
 
-        return session.url;
+        return {id: session.id, url: session.url};
     }
+
 };