ghost 6.60.0 → 6.61.0

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

@@ -16,6 +16,9 @@ exports.EDITORIAL_POST_FIELDS = [
     'created_at',
     'updated_at',
     'published_at',
+    'authors',
+    'author_emails',
+    'tags',
     'feature_image',
     'feature_image_alt',
     'feature_image_caption',
@@ -29,6 +32,7 @@ exports.EDITORIAL_POST_FIELDS = [
     'twitter_image',
     'twitter_title',
     'twitter_description',
+    'comment_id',
     'custom_template',
     'codeinjection_head',
     'codeinjection_foot',
@@ -58,6 +62,9 @@ exports.postImportRowSchema = zod_1.z
     created_at: optionalCell,
     updated_at: optionalCell,
     published_at: optionalCell,
+    authors: optionalCell,
+    author_emails: optionalCell,
+    tags: optionalCell,
     feature_image: optionalCell,
     feature_image_alt: optionalCell,
     feature_image_caption: optionalCell,
@@ -71,6 +78,7 @@ exports.postImportRowSchema = zod_1.z
     twitter_image: optionalCell,
     twitter_title: optionalCell,
     twitter_description: optionalCell,
+    comment_id: optionalCell,
     custom_template: optionalCell,
     codeinjection_head: optionalCell,
     codeinjection_foot: optionalCell,
@@ -95,6 +103,9 @@ exports.importableRowSchema = exports.postImportRowSchema.superRefine((row, ctx)
     else if (row.title.length > 255) {
         ctx.addIssue({ code: 'custom', message: 'title must be 255 characters or fewer' });
     }
+    if (row.comment_id && row.comment_id.length > 50) {
+        ctx.addIssue({ code: 'custom', message: 'comment_id must be 50 characters or fewer' });
+    }
     for (const field of DATE_FIELDS) {
         const value = row[field];
         if (value && !isValidDate(value)) {

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

@@ -0,0 +1,29 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.importRequestSchema = exports.mappingSchema = void 0;
+const zod_1 = require("zod");
+const row_1 = require("./row");
+const importableFields = new Set(row_1.EDITORIAL_POST_FIELDS);
+exports.mappingSchema = zod_1.z.record(zod_1.z.string(), zod_1.z.string()).superRefine((mapping, ctx) => {
+    const targets = new Set();
+    for (const [header, target] of Object.entries(mapping)) {
+        if (!header || header in Object.prototype) {
+            ctx.addIssue({ code: 'custom', message: `Invalid CSV header mapping: "${header}"` });
+        }
+        if (target && !importableFields.has(target)) {
+            ctx.addIssue({ code: 'custom', message: `Unknown post field mapping: "${target}"` });
+        }
+        if (target && targets.has(target)) {
+            ctx.addIssue({ code: 'custom', message: `Post field is mapped more than once: "${target}"` });
+        }
+        targets.add(target);
+    }
+    if (!targets.has('title')) {
+        ctx.addIssue({ code: 'custom', message: 'Post field mapping must include "title"' });
+    }
+});
+exports.importRequestSchema = zod_1.z.object({
+    filePath: zod_1.z.string().min(1),
+    fileName: zod_1.z.string().min(1),
+    mapping: exports.mappingSchema.optional(),
+});

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

@@ -0,0 +1,125 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.prepareImportSource = prepareImportSource;
+exports.isDataFile = isDataFile;
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const path_1 = __importDefault(require("path"));
+const glob_1 = require("glob");
+const import_archive_1 = __importDefault(require("../../../data/importer/import-archive"));
+const assets_1 = require("./assets");
+const errors = require('@tryghost/errors');
+const DATA_EXTENSIONS = new Set(['.csv', '.json', '.md', '.markdown']);
+const noCleanup = async () => { };
+async function prepareImportSource(request) {
+    const extension = path_1.default.extname(request.fileName).toLowerCase();
+    if (extension === '.csv') {
+        return { filePath: request.filePath, cleanup: noCleanup };
+    }
+    if (extension !== '.zip') {
+        throw new errors.ValidationError({ message: 'Please select a valid CSV or ZIP file.' });
+    }
+    const archive = new import_archive_1.default({
+        extensions: [...DATA_EXTENSIONS],
+        directories: [],
+    });
+    const directory = await archive.extract(request.filePath);
+    let cleaned = false;
+    const cleanup = async () => {
+        if (!cleaned) {
+            cleaned = true;
+            await fs_extra_1.default.remove(directory);
+        }
+    };
+    try {
+        archive.isValid(directory);
+        const baseDirectory = archive.getBaseDirectory(directory);
+        const entries = (0, glob_1.globSync)('**/*', { cwd: directory, nodir: true, dot: true });
+        const dataFiles = entries.filter(isDataFile);
+        const csvFiles = dataFiles.filter((file) => extensionOf(file) === '.csv');
+        if (csvFiles.length === 0) {
+            throw new errors.ValidationError({
+                message: 'ZIP files uploaded here must contain one CSV file.',
+            });
+        }
+        if (csvFiles.length > 1) {
+            throw new errors.ValidationError({
+                message: 'ZIP files can contain only one CSV file. Remove the extra CSV files and try again.',
+            });
+        }
+        if (dataFiles.length > 1 || entries.some(isUnsupportedCompetingDataFile)) {
+            throw new errors.ValidationError({
+                message: 'ZIP files cannot contain CSV, JSON, or Markdown import files together. Keep only the CSV file and try again.',
+            });
+        }
+        validateWrapper(entries, csvFiles[0]);
+        const csvParts = csvFiles[0].split('/').filter(Boolean);
+        const csvBaseDirectory = csvParts.length === 2 ? csvParts[0] : undefined;
+        if (csvBaseDirectory !== baseDirectory) {
+            throw new errors.ValidationError({ message: 'Invalid ZIP file structure.' });
+        }
+        return {
+            filePath: path_1.default.join(directory, csvFiles[0]),
+            assets: await (0, assets_1.prepareAssetBatch)(archive, directory, baseDirectory),
+            cleanup,
+        };
+    }
+    catch (error) {
+        await cleanup();
+        throw error;
+    }
+}
+function validateWrapper(entries, csvFile) {
+    const csvParts = csvFile.split('/').filter(Boolean);
+    if (csvParts.length !== 2) {
+        return;
+    }
+    const wrapper = csvParts[0];
+    const outsideWrapper = entries.some((entry) => {
+        const parts = entry.split('/').filter(Boolean);
+        return !isMetadata(parts) && parts[0] !== wrapper;
+    });
+    if (outsideWrapper) {
+        throw new errors.ValidationError({ message: 'Invalid ZIP file structure.' });
+    }
+}
+function isDataFile(fileName) {
+    const parts = fileName.split('/').filter(Boolean);
+    if (parts.length === 0 || isMetadata(parts)) {
+        return false;
+    }
+    const extension = extensionOf(fileName);
+    if (!DATA_EXTENSIONS.has(extension)) {
+        return false;
+    }
+    if (parts.length === 1) {
+        return true;
+    }
+    return parts.length === 2;
+}
+function extensionOf(fileName) {
+    return path_1.default.posix.extname(fileName).toLowerCase();
+}
+function isUnsupportedCompetingDataFile(fileName) {
+    const extension = extensionOf(fileName);
+    if (extension === '.csv' || !DATA_EXTENSIONS.has(extension)) {
+        return false;
+    }
+    const parts = fileName.split('/').filter(Boolean);
+    if (parts.length === 0 || isMetadata(parts) || isFileAttachment(parts)) {
+        return false;
+    }
+    return !isDataFile(fileName);
+}
+function isFileAttachment(parts) {
+    const assetParts = ['content', 'files'].includes(parts[0]) ? [...parts] : parts.slice(1);
+    if (assetParts[0] === 'content') {
+        assetParts.shift();
+    }
+    return assetParts.length > 1 && assetParts[0] === 'files';
+}
+function isMetadata(parts) {
+    return (parts[0] === '__MACOSX' || parts.some((part) => part.startsWith('._') || part === '.DS_Store'));
+}

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

@@ -7,34 +7,13 @@ exports.init = init;
 exports.importCSV = importCSV;
 const zod_1 = require("zod");
 const importer_1 = __importDefault(require("./import/importer"));
+const post_repository_1 = require("./import/post-repository");
 const reader_1 = __importDefault(require("./import/reader"));
-const row_1 = require("./import/row");
+const schema_1 = require("./import/schema");
 const store_1 = require("./import/store");
+const source_1 = require("./import/source");
 // The request is built from HTTP upload metadata, so it is validated at the
 // service boundary rather than trusted.
-const importableFields = new Set(row_1.EDITORIAL_POST_FIELDS);
-const mappingSchema = zod_1.z.record(zod_1.z.string(), zod_1.z.string()).superRefine((mapping, ctx) => {
-    const targets = new Set();
-    for (const [header, target] of Object.entries(mapping)) {
-        if (!header || header in Object.prototype) {
-            ctx.addIssue({ code: 'custom', message: `Invalid CSV header mapping: "${header}"` });
-        }
-        if (target && !importableFields.has(target)) {
-            ctx.addIssue({ code: 'custom', message: `Unknown post field mapping: "${target}"` });
-        }
-        if (target && targets.has(target)) {
-            ctx.addIssue({ code: 'custom', message: `Post field is mapped more than once: "${target}"` });
-        }
-        targets.add(target);
-    }
-    if (!targets.has('title')) {
-        ctx.addIssue({ code: 'custom', message: 'Post field mapping must include "title"' });
-    }
-});
-const importRequestSchema = zod_1.z.object({
-    filePath: zod_1.z.string().min(1),
-    mapping: mappingSchema.optional(),
-});
 // 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');
@@ -64,9 +43,8 @@ function makeImporter() {
     };
     return new importer_1.default({
         readRows: reader_1.default,
-        posts: {
-            create: (data, options) => models.Post.add(data, options),
-        },
+        prepareSource: source_1.prepareImportSource,
+        posts: new post_repository_1.BookshelfPostsRepository(models),
         getHtmlToLexical: () => lexicalLib.htmlToLexicalConverter,
         getMarkdownToHtml: () => require('@tryghost/kg-markdown-html-renderer').render,
         getCleanHTML: () => require('@tryghost/mg-clean-html').cleanHTML,
@@ -88,7 +66,7 @@ function importCSV(request) {
     if (!importer) {
         throw new errors.InternalServerError({ message: 'Content import service used before init' });
     }
-    const parsedRequest = importRequestSchema.safeParse(request);
+    const parsedRequest = schema_1.importRequestSchema.safeParse(request);
     if (!parsedRequest.success) {
         throw new errors.ValidationError({
             message: parsedRequest.error.issues[0]?.message ?? 'Invalid content import request',

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

@@ -364,15 +364,22 @@ class EmailAnalyticsService {
             }
         };
         try {
-            await this.#fetchEvents({
+            const fetchResult = await this.#fetchEvents({
                 batchHandler: processBatch,
                 begin,
                 end,
                 maxEvents,
                 events: eventTypes,
             });
+            if (fetchResult?.safeCursor &&
+                (!fetchData.lastEventTimestamp || fetchResult.safeCursor < fetchData.lastEventTimestamp)) {
+                fetchData.lastEventTimestamp = fetchResult.safeCursor;
+            }
         }
         catch (err) {
+            // A fetch can process events from one domain before another domain fails. Keep the
+            // in-memory cursor at the start of this run so the next attempt retries every domain.
+            fetchData.lastEventTimestamp = begin;
             if (!(err instanceof Error) || err.message !== 'Fetching canceled') {
                 logging_1.default.error('[EmailAnalytics] Error while fetching');
                 logging_1.default.error(err);

package/core/server/services/email-analytics/lib/queries.js

@@ -122,7 +122,13 @@ class Queries {
      */
     async getLastJobRunTimestamp(jobName) {
         const jobData = await this.getJobData(jobName);
-        return jobData ? jobData.finished_at || jobData.started_at : null;
+        const timestamp = jobData?.finished_at ?? jobData?.started_at ?? null;
+        if (timestamp === null) {
+            return null;
+        }
+        // SQLite returns datetime columns as strings or numbers, so normalise to a Date to match
+        // the declared return type and keep callers using Date methods (e.g. getTime()) safe.
+        return timestamp instanceof Date ? timestamp : new Date(timestamp);
     }
     /**
      * Sets the timestamp of the last seen event for the specified email analytics events.

package/core/server/services/gift-links/schema.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DbGiftLink = void 0;
 const zod_1 = require("zod");
-const db_date_1 = require("../../lib/db-date");
+const date_1 = require("../../lib/db-types/date");
 exports.DbGiftLink = zod_1.z.object({
     token: zod_1.z.string(),
     post_id: zod_1.z.string(),
-    created_at: db_date_1.DbDate,
-    updated_at: db_date_1.DbDate.nullable(),
+    created_at: date_1.DbDate,
+    updated_at: date_1.DbDate.nullable(),
 });

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

@@ -37,7 +37,7 @@ The buyer's chosen way of handing over a gift subscription: the publication emai
 _Avoid_: Delivery mode
 
 **Redemption link**:
-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.
+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, recipient email, and personal message; the intended recipient does not reserve redemption.
 _Avoid_: Gift Link
 
 **Gift redemption**:

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GIFT_DELIVERY_EMAIL_TAG = exports.GIFT_DELIVERY_STALE_AFTER_MS = exports.GIFT_REMINDER_FLOOR_DAYS = exports.GIFT_REMINDER_LEAD_DAYS = exports.GIFT_SEND_HOUR = exports.GIFT_MAX_SCHEDULE_DAYS = exports.GIFT_EXPIRY_DAYS = void 0;
 exports.GIFT_EXPIRY_DAYS = 365;
 // How far ahead a delivery may be scheduled. Portal's picker carries its own
-// copy (GIFT_MAX_SCHEDULE_DAYS in beta-gift-page.jsx) since Portal ships
+// copy (GIFT_MAX_SCHEDULE_DAYS in beta-gift-page.tsx) since Portal ships
 // separately — change them together.
 exports.GIFT_MAX_SCHEDULE_DAYS = 365;
 // Site-local hour a scheduled delivery is sent at. Portal never derives

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

@@ -7,7 +7,7 @@ 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");
+const date_1 = require("../../lib/db-types/date");
 class GiftBookshelfRepository {
     model;
     knex;
@@ -117,7 +117,7 @@ class GiftBookshelfRepository {
     async deleteAbandonedCheckouts(cutoff) {
         return this.knex('gifts')
             .where({ status: 'payment_pending' })
-            .where('checkout_started_at', '<=', (0, db_date_1.toDatabaseDate)(cutoff))
+            .where('checkout_started_at', '<=', (0, date_1.toDatabaseDate)(cutoff))
             .del();
     }
     async create(gift, options = {}) {

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

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GiftDeliveryBookshelfRepository = void 0;
 const errors_1 = __importDefault(require("@tryghost/errors"));
-const db_date_1 = require("../../lib/db-date");
+const date_1 = require("../../lib/db-types/date");
 const gift_codec_1 = require("./gift-codec");
 const gift_delivery_codec_1 = require("./gift-delivery-codec");
 // A null scheduled_at means the delivery was due at purchase time, so it is
@@ -14,7 +14,7 @@ function dueDeliveries(query, now) {
     query.andWhere((due) => {
         due
             .whereNull('gift_deliveries.scheduled_at')
-            .orWhere('gift_deliveries.scheduled_at', '<=', (0, db_date_1.toDatabaseDate)(now));
+            .orWhere('gift_deliveries.scheduled_at', '<=', (0, date_1.toDatabaseDate)(now));
     });
 }
 // Deliveries that still need a send attempt: never started, or claimed by a
@@ -24,7 +24,7 @@ function recoverableDeliveries(query, staleBefore) {
         recoverable.where('gift_deliveries.status', 'pending').orWhere((stale) => {
             stale
                 .where('gift_deliveries.status', 'sending')
-                .where('gift_deliveries.started_at', '<=', (0, db_date_1.toDatabaseDate)(staleBefore));
+                .where('gift_deliveries.started_at', '<=', (0, date_1.toDatabaseDate)(staleBefore));
         });
     });
 }
@@ -43,6 +43,15 @@ class GiftDeliveryBookshelfRepository {
         const model = await this.model.findOne({ gift_id: giftId }, { require: false, ...options });
         return model ? (0, gift_delivery_codec_1.decodeGiftDeliveryRow)(model.toJSON()) : null;
     }
+    async getByGiftToken(giftToken, options = {}) {
+        const db = options.transacting ?? this.knex;
+        const row = await db('gift_deliveries')
+            .select('gift_deliveries.*')
+            .join('gifts', 'gifts.id', 'gift_deliveries.gift_id')
+            .where('gifts.token', giftToken)
+            .first();
+        return row ? (0, gift_delivery_codec_1.decodeGiftDeliveryRow)(row) : null;
+    }
     async getByProviderMessageId(providerMessageId) {
         const model = await this.model.findOne({ email_provider_message_id: providerMessageId }, { require: false });
         return model ? (0, gift_delivery_codec_1.decodeGiftDeliveryRow)(model.toJSON()) : null;
@@ -83,8 +92,8 @@ class GiftDeliveryBookshelfRepository {
             .join('gifts', 'gifts.id', 'gift_deliveries.gift_id')
             .where('gift_deliveries.status', 'pending')
             .where('gifts.status', 'purchased')
-            .where('gift_deliveries.scheduled_at', '>', (0, db_date_1.toDatabaseDate)(now));
-        return rows.map((row) => (0, db_date_1.fromDatabaseDate)(row.scheduled_at));
+            .where('gift_deliveries.scheduled_at', '>', (0, date_1.toDatabaseDate)(now));
+        return rows.map((row) => (0, date_1.fromDatabaseDate)(row.scheduled_at));
     }
     async tryStartDelivery(id, now, staleBefore) {
         const claimed = await this.knex('gift_deliveries')
@@ -100,7 +109,7 @@ class GiftDeliveryBookshelfRepository {
             .modify(recoverableDeliveries, staleBefore)
             .update({
             status: 'sending',
-            started_at: (0, db_date_1.toDatabaseDate)(now),
+            started_at: (0, date_1.toDatabaseDate)(now),
         });
         if (claimed !== 1) {
             return null;
@@ -110,7 +119,7 @@ class GiftDeliveryBookshelfRepository {
     async markSent(id, sentAt, providerMessageId) {
         return this.updateState(id, 'sending', {
             status: 'sent',
-            email_sent_at: (0, db_date_1.toDatabaseDate)(sentAt),
+            email_sent_at: (0, date_1.toDatabaseDate)(sentAt),
             email_provider_message_id: providerMessageId,
             started_at: null,
         });
@@ -119,7 +128,7 @@ class GiftDeliveryBookshelfRepository {
     // details so the message can still be correlated with transport outcomes
     async recordCancelledAcceptance(id, sentAt, providerMessageId) {
         return this.updateState(id, 'cancelled', {
-            email_sent_at: (0, db_date_1.toDatabaseDate)(sentAt),
+            email_sent_at: (0, date_1.toDatabaseDate)(sentAt),
             email_provider_message_id: providerMessageId,
         });
     }
@@ -145,7 +154,7 @@ class GiftDeliveryBookshelfRepository {
         return updated === 1;
     }
     async recordOutcome({ providerMessageId, outcome, timestamp, error, }) {
-        const outcomeAt = (0, db_date_1.toDatabaseDate)(timestamp);
+        const outcomeAt = (0, date_1.toDatabaseDate)(timestamp);
         const lowerPriorityOutcomes = outcome === 'permanent_failed'
             ? ['temporary_failed', 'delivered']
             : outcome === 'delivered'

package/core/server/services/gifts/gift-delivery-schema.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DbGiftDelivery = exports.GiftDeliveryOutcomeSchema = exports.GiftDeliveryStatusSchema = void 0;
 const zod_1 = require("zod");
-const db_date_1 = require("../../lib/db-date");
+const date_1 = require("../../lib/db-types/date");
 exports.GiftDeliveryStatusSchema = zod_1.z.enum([
     'pending',
     'sending',
@@ -21,11 +21,11 @@ exports.DbGiftDelivery = zod_1.z.object({
     gift_id: zod_1.z.string(),
     recipient_email: zod_1.z.string().email(),
     status: exports.GiftDeliveryStatusSchema.default('pending'),
-    scheduled_at: db_date_1.DbDate.nullable().default(null),
-    started_at: db_date_1.DbDate.nullable().default(null),
-    email_sent_at: db_date_1.DbDate.nullable().default(null),
+    scheduled_at: date_1.DbDate.nullable().default(null),
+    started_at: date_1.DbDate.nullable().default(null),
+    email_sent_at: date_1.DbDate.nullable().default(null),
     email_provider_message_id: zod_1.z.string().nullable().default(null),
     outcome: exports.GiftDeliveryOutcomeSchema.default('unknown'),
-    outcome_at: db_date_1.DbDate.nullable().default(null),
+    outcome_at: date_1.DbDate.nullable().default(null),
     outcome_error: zod_1.z.string().nullable().default(null),
 });

package/core/server/services/gifts/gift-delivery-service.js

@@ -41,6 +41,10 @@ class GiftDeliveryService {
         await this.deps.giftDeliveryRepository.create(delivery, options);
         return delivery.id;
     }
+    async getRecipientEmailForGift(giftToken, options = {}) {
+        const delivery = await this.deps.giftDeliveryRepository.getByGiftToken(giftToken, options);
+        return delivery?.recipientEmail ?? null;
+    }
     async dispatchForGift({ giftId, }) {
         const delivery = await this.deps.giftDeliveryRepository.getByGiftId(giftId);
         if (!delivery || delivery.status !== 'pending') {

package/core/server/services/gifts/gift-schema.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DbGift = exports.GiftStatusSchema = exports.GiftCadenceSchema = void 0;
 const zod_1 = require("zod");
-const db_date_1 = require("../../lib/db-date");
+const date_1 = require("../../lib/db-types/date");
 exports.GiftCadenceSchema = zod_1.z.enum(['month', 'year']);
 exports.GiftStatusSchema = zod_1.z.enum([
     'payment_pending',
@@ -32,14 +32,14 @@ exports.DbGift = zod_1.z.object({
     amount: zod_1.z.number().int().nonnegative(),
     stripe_checkout_session_id: zod_1.z.string().nullable(),
     stripe_payment_intent_id: zod_1.z.string().nullable(),
-    checkout_started_at: db_date_1.DbDate.nullable().default(null),
-    consumes_at: db_date_1.DbDate.nullable(),
-    expires_at: db_date_1.DbDate.nullable(),
+    checkout_started_at: date_1.DbDate.nullable().default(null),
+    consumes_at: date_1.DbDate.nullable(),
+    expires_at: date_1.DbDate.nullable(),
     status: exports.GiftStatusSchema,
-    purchased_at: db_date_1.DbDate.nullable(),
-    redeemed_at: db_date_1.DbDate.nullable(),
-    consumed_at: db_date_1.DbDate.nullable(),
-    expired_at: db_date_1.DbDate.nullable(),
-    refunded_at: db_date_1.DbDate.nullable(),
-    consumes_soon_reminder_sent_at: db_date_1.DbDate.nullable().default(null),
+    purchased_at: date_1.DbDate.nullable(),
+    redeemed_at: date_1.DbDate.nullable(),
+    consumed_at: date_1.DbDate.nullable(),
+    expired_at: date_1.DbDate.nullable(),
+    refunded_at: date_1.DbDate.nullable(),
+    consumes_soon_reminder_sent_at: date_1.DbDate.nullable().default(null),
 });

package/core/server/services/gifts/gift-service.js

@@ -565,7 +565,7 @@ class GiftService {
                 transacting,
                 newMember: input.newMember,
             });
-            const redemption = await this.serializeRedemption(redeemed);
+            const redemption = await this.serializeRedemption(redeemed, { transacting });
             return { redeemed, member, redemption };
         };
         const { redeemed, member, redemption } = input.transacting
@@ -1044,7 +1044,8 @@ class GiftService {
         });
         return true;
     }
-    async serializeRedemption(gift) {
+    async serializeRedemption(gift, options = {}) {
+        const recipientEmail = await this.deps.giftDeliveryService.getRecipientEmailForGift(gift.token, options);
         const tier = await this.deps.tiersService.api.read(gift.tierId);
         if (!tier) {
             throw new errors_1.default.InternalServerError({
@@ -1060,6 +1061,7 @@ class GiftService {
             amount: gift.amount,
             buyer_name: gift.buyerName,
             recipient_name: gift.recipientName,
+            recipient_email: recipientEmail,
             message: gift.personalMessage,
             expires_at: gift.expiresAt,
             consumes_at: gift.consumesAt,

package/core/server/services/jobs-service/register-job-handlers.js

@@ -38,15 +38,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = registerJobHandlers;
 const errors_1 = __importDefault(require("@tryghost/errors"));
-const index_1 = require("./index");
 const clean_tokens_job_1 = __importDefault(require("../members/jobs/clean-tokens-job"));
 const clean_tokens_task_1 = __importDefault(require("../members/jobs/clean-tokens-task"));
 const gifts = __importStar(require("../gifts"));
 const clean_gifts_job_1 = __importDefault(require("../gifts/jobs/clean-gifts-job"));
-const logging = require('@tryghost/logging');
-function registerJobHandlers() {
-    const jobsService = (0, index_1.getInstance)();
-    const db = require('../../data/db');
+const external_media_inliner_job_1 = __importDefault(require("../media-inliner/external-media-inliner-job"));
+function registerJobHandlers({ jobsService, db, logging, mediaInliner, }) {
     jobsService.handle(clean_tokens_job_1.default, async () => {
         await (0, clean_tokens_task_1.default)({ db, logging });
     });
@@ -58,4 +55,7 @@ function registerJobHandlers() {
         }
         await gifts.service.cleanup();
     });
+    jobsService.handle(external_media_inliner_job_1.default, async (job) => {
+        await mediaInliner.inline(job.domains);
+    });
 }