ghost 6.58.0 → 6.59.0

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

@@ -16,6 +16,10 @@ const gift_checkout_offer_1 = require("./gift-checkout-offer");
 const MS_PER_DAY = 24 * 60 * 60 * 1000;
 const GIFT_REMINDER_LEAD_MS = constants_1.GIFT_REMINDER_LEAD_DAYS * MS_PER_DAY;
 const GIFT_REMINDER_FLOOR_MS = constants_1.GIFT_REMINDER_FLOOR_DAYS * MS_PER_DAY;
+const GIFT_NAME_MAX_LENGTH = 191;
+const GIFT_EMAIL_MAX_LENGTH = 191;
+const GIFT_CHECKOUT_MESSAGE_MAX_LENGTH = 250;
+const GIFT_CHECKOUT_RETENTION_DAYS = 30;
 const errorMessages = {
     giftNotFound: 'This gift does not exist.',
     giftAlreadyRedeemed: 'This gift has already been redeemed.',
@@ -41,12 +45,84 @@ const GiftPurchaseDataSchema = zod_1.z.object({
     stripeCheckoutSessionId: zod_1.z.string().min(1),
     stripePaymentIntentId: zod_1.z.string().min(1)
 });
+const StripeBuyerEmailSchema = zod_1.z.unknown().transform((value) => {
+    if (typeof value !== 'string') {
+        return null;
+    }
+    const email = value.trim();
+    return email && email.length <= GIFT_EMAIL_MAX_LENGTH ? email : null;
+});
+const GiftPaymentCompletionSchema = zod_1.z.object({
+    giftId: zod_1.z.string().min(1),
+    buyerEmail: StripeBuyerEmailSchema,
+    stripeCustomerId: zod_1.z.string().min(1).nullable(),
+    stripeCheckoutSessionId: zod_1.z.string().min(1),
+    stripePaymentIntentId: zod_1.z.string().min(1)
+});
+const NullableCheckoutStringSchema = (max) => zod_1.z.preprocess(value => typeof value === 'string' && value.trim() === '' ? null : value, zod_1.z.string().trim().max(max).nullable().optional().default(null));
+const EmptyCheckoutStringSchema = zod_1.z.preprocess(value => typeof value === 'string' && value.trim() === '' ? null : value, zod_1.z.null().optional().default(null));
+const RequiredCheckoutStringSchema = (max) => zod_1.z.string().trim().min(1).max(max);
+const CheckoutBuyerEmailSchema = zod_1.z.string().trim().email().max(GIFT_EMAIL_MAX_LENGTH);
+const GiftCheckoutDeliverySchema = zod_1.z.discriminatedUnion('deliveryMethod', [
+    zod_1.z.object({
+        deliveryMethod: zod_1.z.literal('link'),
+        recipientEmail: EmptyCheckoutStringSchema,
+        recipientName: EmptyCheckoutStringSchema,
+        personalMessage: EmptyCheckoutStringSchema,
+        buyerName: NullableCheckoutStringSchema(GIFT_NAME_MAX_LENGTH)
+    }),
+    zod_1.z.object({
+        deliveryMethod: zod_1.z.literal('email'),
+        recipientEmail: zod_1.z.string().trim().email().max(GIFT_EMAIL_MAX_LENGTH),
+        recipientName: NullableCheckoutStringSchema(GIFT_NAME_MAX_LENGTH),
+        personalMessage: NullableCheckoutStringSchema(GIFT_CHECKOUT_MESSAGE_MAX_LENGTH),
+        buyerName: RequiredCheckoutStringSchema(GIFT_NAME_MAX_LENGTH)
+    })
+]);
 class GiftService {
     deps;
     constructor(deps) {
         this.deps = deps;
     }
     async startCheckout(input) {
+        const customizationEnabled = this.deps.labsService.isSet('giftSubCustomization');
+        const populatedDeliveryFields = [
+            input.recipientEmail,
+            input.recipientName,
+            input.buyerName,
+            input.personalMessage
+        ].some(value => value !== undefined && value !== null && value !== '');
+        if (!customizationEnabled && (input.deliveryMethod === 'email' || populatedDeliveryFields)) {
+            throw new errors_1.default.BadRequestError({
+                message: 'Bad Request.',
+                context: 'Gift email delivery is not available'
+            });
+        }
+        const parsedBuyerEmail = CheckoutBuyerEmailSchema.safeParse(input.buyer.email);
+        if (customizationEnabled && !parsedBuyerEmail.success) {
+            throw new errors_1.default.BadRequestError({
+                message: 'Bad Request.',
+                context: `Invalid gift buyer email: ${parsedBuyerEmail.error.issues[0].message}`
+            });
+        }
+        const buyerEmail = parsedBuyerEmail.success ? parsedBuyerEmail.data : input.buyer.email;
+        const parsedDelivery = GiftCheckoutDeliverySchema.safeParse(customizationEnabled ? {
+            deliveryMethod: input.deliveryMethod ?? 'link',
+            recipientEmail: input.recipientEmail,
+            recipientName: input.recipientName,
+            buyerName: input.buyerName,
+            personalMessage: input.personalMessage
+        } : {
+            deliveryMethod: 'link'
+        });
+        if (!parsedDelivery.success) {
+            const issue = parsedDelivery.error.issues[0];
+            throw new errors_1.default.BadRequestError({
+                message: 'Bad Request.',
+                context: `Invalid gift delivery data: ${issue.message}`
+            });
+        }
+        const delivery = parsedDelivery.data;
         if (input.offerId) {
             throw new errors_1.default.BadRequestError({
                 message: 'Bad Request.',
@@ -61,7 +137,7 @@ class GiftService {
         }
         let resolvedDuration = null;
         let cadence;
-        if (this.deps.labsService.isSet('giftSubCustomization')) {
+        if (customizationEnabled) {
             resolvedDuration = (0, gift_checkout_offer_1.resolveGiftDuration)(input);
             cadence = resolvedDuration.cadence;
         }
@@ -115,32 +191,68 @@ class GiftService {
         successUrl.searchParams.set('gift_token', token);
         successUrl.searchParams.set('gift_tier', tierId);
         successUrl.searchParams.set('gift_cadence', cadence);
+        successUrl.searchParams.set('gift_delivery', delivery.deliveryMethod);
         if (totalMonths !== undefined) {
             successUrl.searchParams.set('gift_duration', String(totalMonths));
         }
-        const customerId = input.buyer.isAuthenticated
-            ? await this.deps.checkoutAdapter.getCustomerId(input.buyer)
+        const buyer = { ...input.buyer, email: buyerEmail };
+        const customerId = buyer.isAuthenticated
+            ? await this.deps.checkoutAdapter.getCustomerId(buyer)
             : null;
-        const url = await this.deps.checkoutAdapter.createSession({
-            amount,
-            currency: tier.currency.toLowerCase(),
-            tierName: tier.name,
+        const gift = gift_1.Gift.fromCheckout({
+            token,
+            buyerEmail,
+            buyerMemberId: buyer.isAuthenticated ? buyer.memberId : null,
+            buyerName: delivery.buyerName,
+            recipientName: delivery.recipientName,
+            personalMessage: delivery.personalMessage,
+            tierId,
             cadence,
             duration,
-            metadata: {
-                ...input.metadata,
-                ghost_gift: 'true',
-                gift_token: token,
-                tier_id: tierId,
-                cadence,
-                duration: String(duration)
-            },
-            successUrl: successUrl.toString(),
-            cancelUrl: input.cancelUrl,
-            customerId,
-            customerEmail: customerId ? null : input.buyer.email
+            currency: tier.currency.toLowerCase(),
+            amount
+        });
+        const giftId = await this.deps.giftRepository.transaction(async (transacting) => {
+            const id = await this.deps.giftRepository.create(gift, { transacting });
+            if (delivery.deliveryMethod === 'email') {
+                await this.deps.giftDeliveryService.createForCheckout({
+                    giftId: id,
+                    recipientEmail: delivery.recipientEmail
+                }, { transacting });
+            }
+            return id;
         });
-        return { url };
+        let session;
+        try {
+            session = await this.deps.checkoutAdapter.createSession({
+                amount,
+                currency: tier.currency.toLowerCase(),
+                tierName: tier.name,
+                cadence,
+                duration,
+                metadata: { ghost_gift_id: giftId },
+                successUrl: successUrl.toString(),
+                cancelUrl: input.cancelUrl,
+                customerId,
+                customerEmail: customerId ? null : buyerEmail,
+                idempotencyKey: giftId
+            });
+        }
+        catch (err) {
+            try {
+                await this.deps.giftRepository.deletePendingCheckout(giftId);
+            }
+            catch (cleanupError) {
+                logging_1.default.error(cleanupError, `Failed to clean up gift checkout ${giftId} after Stripe session creation failed`);
+            }
+            throw err;
+        }
+        const bound = gift.bindCheckoutSession(session.id);
+        if (!bound) {
+            throw new errors_1.default.InternalServerError({ message: `Failed to bind checkout session to gift: ${giftId}` });
+        }
+        await this.deps.giftRepository.update(bound);
+        return { url: session.url };
     }
     generateToken() {
         /**
@@ -155,6 +267,82 @@ class GiftService {
         return token;
     }
     async completePurchase(input) {
+        if ('giftId' in input) {
+            return this.completePendingPurchase(input);
+        }
+        return this.completeLegacyPurchase(input);
+    }
+    async completePendingPurchase(input) {
+        const parsed = GiftPaymentCompletionSchema.safeParse(input);
+        if (!parsed.success) {
+            const issue = parsed.error.issues[0];
+            throw new errors_1.default.ValidationError({
+                message: 'Invalid gift purchase data.',
+                property: issue.path.join('.'),
+                context: issue.message
+            });
+        }
+        const data = parsed.data;
+        const member = data.stripeCustomerId
+            ? await this.deps.memberRepository.get({ customer_id: data.stripeCustomerId })
+            : null;
+        const completed = await this.deps.giftRepository.transaction(async (transacting) => {
+            const gift = await this.deps.giftRepository.getById(data.giftId, { transacting, forUpdate: true });
+            if (!gift) {
+                logging_1.default.error({
+                    event: { name: 'gift_purchase.completion_gift_missing' },
+                    giftId: data.giftId,
+                    stripeCheckoutSessionId: data.stripeCheckoutSessionId,
+                    stripePaymentIntentId: data.stripePaymentIntentId
+                }, 'Paid checkout completion has no matching gift');
+                return null;
+            }
+            if (gift.status !== 'payment_pending') {
+                return null;
+            }
+            if (gift.stripeCheckoutSessionId && gift.stripeCheckoutSessionId !== data.stripeCheckoutSessionId) {
+                throw new errors_1.default.ValidationError({ message: 'Checkout session does not match gift.' });
+            }
+            const buyerEmail = gift.buyerEmail ?? data.buyerEmail ?? member?.get('email') ?? null;
+            if (!buyerEmail) {
+                throw new errors_1.default.ValidationError({
+                    message: 'Invalid gift purchase data.',
+                    property: 'buyerEmail',
+                    context: 'A purchased gift requires a buyer email'
+                });
+            }
+            // The pre-created gift owns the checkout price. Stripe's total may
+            // include automatic tax, so completion only adds settlement facts.
+            const purchased = gift.completePurchase({
+                buyerEmail,
+                buyerMemberId: member?.id ?? gift.buyerMemberId,
+                stripeCheckoutSessionId: data.stripeCheckoutSessionId,
+                stripePaymentIntentId: data.stripePaymentIntentId
+            });
+            if (!purchased) {
+                return null;
+            }
+            await this.deps.giftRepository.update(purchased, { transacting });
+            return purchased;
+        });
+        if (!completed) {
+            return false;
+        }
+        let recipientEmail = null;
+        try {
+            recipientEmail = await this.deps.giftDeliveryService.dispatchForGift(data.giftId);
+        }
+        catch (err) {
+            logging_1.default.error({
+                event: { name: 'gift_delivery.dispatch_failed' },
+                err,
+                giftId: data.giftId
+            }, 'Failed to dispatch purchased gift delivery');
+        }
+        await this.sendPurchaseNotifications(completed, member, recipientEmail);
+        return true;
+    }
+    async completeLegacyPurchase(input) {
         const parsed = GiftPurchaseDataSchema.safeParse(input);
         if (!parsed.success) {
             const issue = parsed.error.issues[0];
@@ -184,20 +372,44 @@ class GiftService {
             stripePaymentIntentId: data.stripePaymentIntentId
         });
         await this.deps.giftRepository.create(gift);
-        const tier = await this.deps.tiersService.api.read(data.tierId);
+        await this.sendPurchaseNotifications(gift, member, null);
+        return true;
+    }
+    async sendPurchaseNotifications(gift, member, recipientEmail) {
+        let tier;
+        try {
+            tier = await this.deps.tiersService.api.read(gift.tierId);
+        }
+        catch (err) {
+            logging_1.default.error({
+                event: { name: 'gift_purchase_notifications.tier_read_failed' },
+                err,
+                tierId: gift.tierId
+            }, 'Failed to read tier for gift purchase notifications');
+            return;
+        }
         if (!tier) {
-            throw new errors_1.default.NotFoundError({ message: `Tier not found: ${data.tierId}` });
+            logging_1.default.error({
+                event: { name: 'gift_purchase_notifications.tier_missing' },
+                tierId: gift.tierId
+            }, 'Tier not found for gift purchase notifications');
+            return;
+        }
+        const buyerEmail = gift.buyerEmail ?? member?.get('email') ?? null;
+        if (!buyerEmail) {
+            logging_1.default.warn('Skipping purchase notifications because the buyer email is unavailable');
+            return;
         }
         try {
             await this.deps.staffServiceEmails.notifyGiftPurchased({
                 name: member?.get('name') ?? null,
-                email: member?.get('email') ?? data.buyerEmail,
+                email: member?.get('email') ?? buyerEmail,
                 memberId: member?.id ?? null,
-                amount: data.amount,
-                currency: data.currency,
+                amount: gift.amount,
+                currency: gift.currency,
                 tierName: tier.name,
-                cadence: data.cadence,
-                duration: data.duration
+                cadence: gift.cadence,
+                duration: gift.duration
             });
         }
         catch (err) {
@@ -205,23 +417,25 @@ class GiftService {
         }
         try {
             await this.deps.giftEmailService.sendPurchaseConfirmation({
-                buyerEmail: data.buyerEmail,
-                token: data.token,
+                buyerEmail,
+                token: gift.token,
                 tierName: tier.name,
-                cadence: data.cadence,
-                duration: data.duration,
-                expiresAt: gift.expiresAt
+                cadence: gift.cadence,
+                duration: gift.duration,
+                expiresAt: gift.expiresAt,
+                recipientEmail
             });
         }
         catch (err) {
             logging_1.default.error('Failed to send gift purchase confirmation email', err);
         }
-        return true;
     }
     assertRedeemable(gift, memberStatus) {
         const redeemableCheck = gift.checkRedeemable(memberStatus);
         if (!redeemableCheck.redeemable) {
             switch (redeemableCheck.reason) {
+                case 'payment-pending':
+                    throw new errors_1.default.NotFoundError({ message: (0, tpl_1.default)(errorMessages.giftNotFound) });
                 case 'redeemed':
                     throw new errors_1.default.BadRequestError({
                         message: (0, tpl_1.default)(errorMessages.giftAlreadyRedeemed),
@@ -332,6 +546,7 @@ class GiftService {
             status: 'gift'
         }, { id: memberId, transacting });
         await this.deps.giftRepository.update(redeemed, { transacting });
+        await this.deps.giftDeliveryService.cancelPendingForGift(redeemed.token, { transacting });
         // Gift members receive the paid welcome email, as they receive access to paid content
         await this.deps.memberRepository.triggerMemberSignupAutomation(memberId, member.get('email'), 'paid', { transacting });
         return { redeemed, member };
@@ -390,7 +605,7 @@ class GiftService {
     }
     async getPreview(token) {
         const gift = await this.deps.giftRepository.getByToken(token);
-        if (!gift) {
+        if (!gift || gift.status === 'payment_pending') {
             return null;
         }
         const tier = await this.deps.tiersService.api.read(gift.tierId);
@@ -481,6 +696,7 @@ class GiftService {
         }
         await this.deps.giftRepository.transaction(async (transacting) => {
             await this.deps.giftRepository.update(refunded, { transacting });
+            await this.deps.giftDeliveryService.cancelPendingForGift(refunded.token, { transacting });
             if (gift.redeemerMemberId) {
                 const member = await this.deps.memberRepository.get({ id: gift.redeemerMemberId }, { transacting });
                 if (member?.get('status') === 'gift') {
@@ -562,11 +778,17 @@ class GiftService {
                     return;
                 }
                 await this.deps.giftRepository.update(expired, { transacting });
+                await this.deps.giftDeliveryService.cancelPendingForGift(expired.token, { transacting });
                 expiredCount += 1;
             });
         }
         return { expiredCount };
     }
+    async processAbandonedCheckouts() {
+        const cutoff = new Date(Date.now() - GIFT_CHECKOUT_RETENTION_DAYS * MS_PER_DAY);
+        const deletedCount = await this.deps.giftRepository.deleteAbandonedCheckouts(cutoff);
+        return { deletedCount };
+    }
     async processReminders() {
         const now = new Date();
         const toRemind = await this.deps.giftRepository.findPendingReminder({
@@ -668,6 +890,9 @@ class GiftService {
             duration: gift.duration,
             currency: gift.currency,
             amount: gift.amount,
+            buyer_name: gift.buyerName,
+            recipient_name: gift.recipientName,
+            message: gift.personalMessage,
             expires_at: gift.expiresAt,
             consumes_at: gift.consumesAt,
             tier: {

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

@@ -6,6 +6,9 @@ class Gift {
     token;
     buyerEmail;
     buyerMemberId;
+    buyerName;
+    recipientName;
+    personalMessage;
     redeemerMemberId;
     tierId;
     cadence;
@@ -14,6 +17,7 @@ class Gift {
     amount;
     stripeCheckoutSessionId;
     stripePaymentIntentId;
+    checkoutStartedAt;
     consumesAt;
     expiresAt;
     status;
@@ -27,6 +31,9 @@ class Gift {
         this.token = data.token;
         this.buyerEmail = data.buyerEmail;
         this.buyerMemberId = data.buyerMemberId;
+        this.buyerName = data.buyerName ?? null;
+        this.recipientName = data.recipientName ?? null;
+        this.personalMessage = data.personalMessage ?? null;
         this.redeemerMemberId = data.redeemerMemberId;
         this.tierId = data.tierId;
         this.cadence = data.cadence;
@@ -35,27 +42,29 @@ class Gift {
         this.amount = data.amount;
         this.stripeCheckoutSessionId = data.stripeCheckoutSessionId;
         this.stripePaymentIntentId = data.stripePaymentIntentId;
+        this.checkoutStartedAt = data.checkoutStartedAt ?? null;
         this.consumesAt = data.consumesAt;
+        this.purchasedAt = data.purchasedAt;
         this.expiresAt = data.expiresAt;
         this.status = data.status;
-        this.purchasedAt = data.purchasedAt;
         this.redeemedAt = data.redeemedAt;
         this.consumedAt = data.consumedAt;
         this.expiredAt = data.expiredAt;
         this.refundedAt = data.refundedAt;
-        this.consumesSoonReminderSentAt = data.consumesSoonReminderSentAt;
+        this.consumesSoonReminderSentAt = data.consumesSoonReminderSentAt ?? null;
     }
     static fromPurchase(data) {
-        const now = new Date();
-        const expiresAt = new Date(now);
+        const purchasedAt = new Date();
+        const expiresAt = new Date(purchasedAt);
         expiresAt.setDate(expiresAt.getDate() + constants_1.GIFT_EXPIRY_DAYS);
         return new Gift({
             ...data,
             redeemerMemberId: null,
             consumesAt: null,
+            checkoutStartedAt: purchasedAt,
             expiresAt,
             status: 'purchased',
-            purchasedAt: now,
+            purchasedAt,
             redeemedAt: null,
             consumedAt: null,
             expiredAt: null,
@@ -63,6 +72,48 @@ class Gift {
             consumesSoonReminderSentAt: null
         });
     }
+    static fromCheckout(data) {
+        return new Gift({
+            ...data,
+            redeemerMemberId: null,
+            stripeCheckoutSessionId: null,
+            stripePaymentIntentId: null,
+            checkoutStartedAt: new Date(),
+            consumesAt: null,
+            expiresAt: null,
+            status: 'payment_pending',
+            purchasedAt: null,
+            redeemedAt: null,
+            consumedAt: null,
+            expiredAt: null,
+            refundedAt: null,
+            consumesSoonReminderSentAt: null
+        });
+    }
+    completePurchase(data) {
+        if (this.status !== 'payment_pending') {
+            return null;
+        }
+        const purchasedAt = data.purchasedAt ?? new Date();
+        const expiresAt = new Date(purchasedAt);
+        expiresAt.setDate(expiresAt.getDate() + constants_1.GIFT_EXPIRY_DAYS);
+        return new Gift({
+            ...this,
+            ...data,
+            purchasedAt,
+            expiresAt,
+            status: 'purchased'
+        });
+    }
+    bindCheckoutSession(checkoutSessionId) {
+        if (this.status !== 'payment_pending' || this.stripeCheckoutSessionId !== null) {
+            return null;
+        }
+        return new Gift({
+            ...this,
+            stripeCheckoutSessionId: checkoutSessionId
+        });
+    }
     isRedeemed() {
         return this.redeemedAt !== null;
     }
@@ -76,6 +127,9 @@ class Gift {
         return this.consumedAt !== null;
     }
     checkRedeemable(memberStatus) {
+        if (this.status === 'payment_pending') {
+            return { redeemable: false, reason: 'payment-pending' };
+        }
         if (this.isRedeemed()) {
             return { redeemable: false, reason: 'redeemed' };
         }

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

@@ -2,16 +2,21 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.service = exports.controller = void 0;
 exports.init = init;
+exports.recoverPendingDeliveries = recoverPendingDeliveries;
 const gift_bookshelf_repository_1 = require("./gift-bookshelf-repository");
+const gift_delivery_bookshelf_repository_1 = require("./gift-delivery-bookshelf-repository");
+const gift_delivery_service_1 = require("./gift-delivery-service");
 const gift_service_1 = require("./gift-service");
 const gift_reminder_scheduler_1 = require("./gift-reminder-scheduler");
 const gift_email_service_1 = require("./gift-email-service");
 const gift_controller_1 = require("./gift-controller");
+const send_gift_delivery_event_1 = require("./events/send-gift-delivery-event");
+let deliveryService;
 async function init(options) {
     if (exports.service) {
         return;
     }
-    const { Gift: GiftModel, MemberStripeCustomer: StripeCustomerModel } = require('../../models');
+    const { Base: BaseModel, Gift: GiftModel, GiftDelivery: GiftDeliveryModel, MemberStripeCustomer: StripeCustomerModel } = require('../../models');
     const GiftCheckoutAdapter = require('./gift-checkout-adapter');
     const membersService = require('../members');
     const tiersService = require('../tiers');
@@ -23,6 +28,8 @@ async function init(options) {
     const StartGiftCleanupEvent = require('./events/start-gift-cleanup-event');
     const jobs = require('./jobs');
     const { GhostMailer } = require('../mail');
+    const MailgunClient = require('../lib/mailgun-client');
+    const config = require('../../../shared/config');
     const settingsCache = require('../../../shared/settings-cache');
     const labsService = require('../../../shared/labs');
     const urlUtils = require('../../../shared/url-utils').default;
@@ -31,20 +38,32 @@ async function init(options) {
     const { blogIcon } = require('../../../server/lib/image');
     const { t } = require('../i18n');
     const repository = new gift_bookshelf_repository_1.GiftBookshelfRepository({
-        GiftModel
+        GiftModel,
+        knex: BaseModel.knex
+    });
+    const deliveryRepository = new gift_delivery_bookshelf_repository_1.GiftDeliveryBookshelfRepository({
+        GiftDeliveryModel,
+        knex: BaseModel.knex
     });
     const checkoutAdapter = new GiftCheckoutAdapter({
         StripeCustomerModel,
         getStripeApi: () => require('../stripe').api
     });
     const giftEmailService = new gift_email_service_1.GiftEmailService({
-        mailer: new GhostMailer(),
+        transactionalMailer: new GhostMailer(),
+        bulkMailer: new MailgunClient({ config, settings: settingsCache }),
         settingsCache,
         urlUtils,
         getFromAddress: () => EmailAddressParser.stringify(settingsHelpers.getDefaultEmail()),
         blogIcon,
         t
     });
+    const giftDeliveryService = new gift_delivery_service_1.GiftDeliveryService({
+        giftRepository: repository,
+        giftDeliveryRepository: deliveryRepository,
+        tiersService,
+        giftEmailService
+    });
     const giftReminderScheduler = new gift_reminder_scheduler_1.GiftReminderScheduler({
         apiUrl: options.apiUrl,
         adapter: options.schedulerAdapter,
@@ -53,6 +72,7 @@ async function init(options) {
     });
     const giftService = new gift_service_1.GiftService({
         giftRepository: repository,
+        giftDeliveryService,
         get memberRepository() {
             return membersService.api.members;
         },
@@ -67,6 +87,7 @@ async function init(options) {
         settingsCache
     });
     exports.service = giftService;
+    deliveryService = giftDeliveryService;
     exports.controller = new gift_controller_1.GiftController({ service: giftService });
     DomainEvents.subscribe(SubscriptionActivatedEvent, async (event) => {
         try {
@@ -86,7 +107,25 @@ async function init(options) {
             logging.error(err, 'Failed to process gift reminders');
         }
     });
+    DomainEvents.subscribe(send_gift_delivery_event_1.SendGiftDeliveryEvent, async (event) => {
+        const start = Date.now();
+        try {
+            const result = await giftDeliveryService.send(event.data.deliveryId);
+            logging.info(`Gift delivery ${event.data.deliveryId} ${result} in ${Date.now() - start}ms`);
+        }
+        catch (err) {
+            logging.error(err, `Failed to process gift delivery ${event.data.deliveryId}`);
+        }
+    });
     DomainEvents.subscribe(StartGiftCleanupEvent, async () => {
+        const checkoutStart = Date.now();
+        try {
+            const { deletedCount } = await giftService.processAbandonedCheckouts();
+            logging.info(`Deleted ${deletedCount} abandoned gift checkouts in ${Date.now() - checkoutStart}ms`);
+        }
+        catch (err) {
+            logging.error(err, 'Failed to clean abandoned gift checkouts');
+        }
         const consumedStart = Date.now();
         try {
             const { consumedCount, updatedMemberCount } = await giftService.processConsumed();
@@ -103,7 +142,34 @@ async function init(options) {
         catch (err) {
             logging.error(err, 'Failed to process expired gifts');
         }
+        try {
+            const { sentCount, skippedCount, failedCount } = await giftDeliveryService.recoverPending();
+            if (sentCount + skippedCount + failedCount > 0) {
+                logging.info(`Gift delivery recovery during cleanup: ${sentCount} sent, ${skippedCount} skipped, ${failedCount} failed`);
+            }
+        }
+        catch (err) {
+            logging.error(err, 'Failed to recover pending gift deliveries during cleanup');
+        }
     });
     jobs.scheduleGiftCleanupJob();
     jobs.scheduleGiftReminderJob();
 }
+// Retries deliveries interrupted by a previous shutdown. Sending needs the tiers
+// and members services, which boot alongside this one, so this must run once
+// every service has finished initialising rather than from init().
+async function recoverPendingDeliveries() {
+    if (!deliveryService) {
+        return;
+    }
+    const logging = require('@tryghost/logging');
+    try {
+        const { sentCount, skippedCount, failedCount } = await deliveryService.recoverPending();
+        if (sentCount + skippedCount + failedCount > 0) {
+            logging.info(`Gift delivery recovery: ${sentCount} sent, ${skippedCount} skipped, ${failedCount} failed`);
+        }
+    }
+    catch (err) {
+        logging.error(err, 'Failed to recover pending gift deliveries');
+    }
+}

package/core/server/services/lib/mailgun-client.js

@@ -95,8 +95,11 @@ module.exports = class MailgunClient {
                 messageData['o:testmode'] = true;
             }
 
-            // enable tracking if turned on for this email
-            if (message.track_opens) {
+            if (message.disable_tracking) {
+                messageData['o:tracking'] = 'no';
+                messageData['o:tracking-clicks'] = 'no';
+                messageData['o:tracking-opens'] = 'no';
+            } else if (message.track_opens) {
                 messageData['o:tracking-opens'] = true;
             }