ghost 6.60.0 → 6.62.0

package/core/server/services/email-service/batch-sending-service.js

@@ -33,7 +33,6 @@ class BatchSendingService {
   #models;
   #db;
   #sentry;
-  #debugStorageFilePath;
   #getRequiredUrlRelations;
   #shuttingDown = false;
   #inFlight = new Set();
@@ -68,7 +67,6 @@ class BatchSendingService {
    * @param {object} [dependencies.BEFORE_RETRY_CONFIG]
    * @param {object} [dependencies.AFTER_RETRY_CONFIG]
    * @param {object} [dependencies.MAILGUN_API_RETRY_CONFIG]
-   * @param {string} [dependencies.debugStorageFilePath]
    */
   constructor({
     emailRenderer,
@@ -83,7 +81,6 @@ class BatchSendingService {
     BEFORE_RETRY_CONFIG,
     AFTER_RETRY_CONFIG,
     MAILGUN_API_RETRY_CONFIG,
-    debugStorageFilePath,
   }) {
     this.#emailRenderer = emailRenderer;
     this.#sendingService = sendingService;
@@ -93,7 +90,6 @@ class BatchSendingService {
     this.#models = models;
     this.#db = db;
     this.#sentry = sentry;
-    this.#debugStorageFilePath = debugStorageFilePath;
     this.#getRequiredUrlRelations = getRequiredUrlRelations;
 
     if (BEFORE_RETRY_CONFIG) {

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

@@ -13,7 +13,7 @@ function isUnsplashImage(url) {
 }
 const { DateTime } = require('luxon');
 const htmlToPlaintext = require('@tryghost/html-to-plaintext');
-const EmailAddressParser = require('../email-address/email-address-parser');
+const emailAddressParser = require('../email-address/email-address-parser');
 const { getEmailDesign } = require('../email-rendering/email-design');
 const { registerHelpers } = require('./helpers/register-helpers');
 const crypto = require('crypto');
@@ -229,6 +229,8 @@ function cheerioLoad(html) {
  * @prop {string} id
  * @prop {RegExp} token
  * @prop {(member: MemberLike) => string} getValue
+ * @prop {boolean} [trusted] - Value is server-generated, so it is inserted into the
+ *   html body as-is instead of being HTML-escaped. Defaults to false (escaped).
  */
 
 /**
@@ -337,7 +339,7 @@ class EmailRenderer {
   }
 
   #getRawFromAddress(post, newsletter) {
-    // Pass the raw name through; EmailAddressParser.stringify() is the single
+    // Pass the raw name through; emailAddressParser.stringify() is the single
     // point that escapes it for the RFC5322 quoted-string From header. Escaping
     // here too would double-escape (e.g. a title containing a double quote).
     let senderName = this.#settingsCache.get('title') || '';
@@ -394,7 +396,7 @@ class EmailRenderer {
       { useFallbackAddress },
     );
 
-    return EmailAddressParser.stringify(addresses.from);
+    return emailAddressParser.stringify(addresses.from);
   }
 
   /**
@@ -423,7 +425,7 @@ class EmailRenderer {
     );
 
     if (addresses.replyTo) {
-      return EmailAddressParser.stringify(addresses.replyTo);
+      return emailAddressParser.stringify(addresses.replyTo);
     }
     return null;
   }
@@ -920,18 +922,21 @@ class EmailRenderer {
         getValue: (member) => {
           return this.createUnsubscribeUrl(member.uuid, { newsletterUuid });
         },
+        trusted: true, // Server-generated URL, must not be HTML-escaped
       },
       {
         id: 'manage_account_url',
         getValue: () => {
           return this.createManageAccountUrl();
         },
+        trusted: true, // Server-generated URL, must not be HTML-escaped
       },
       {
         id: 'uuid',
         getValue: (member) => {
           return member.uuid;
         },
+        trusted: true, // Server-generated identifier
       },
       {
         id: 'key',
@@ -941,6 +946,7 @@ class EmailRenderer {
             .update(member.uuid)
             .digest('hex');
         },
+        trusted: true, // Server-generated hmac
       },
       {
         id: 'first_name',
@@ -1000,6 +1006,7 @@ class EmailRenderer {
           return this.createUnsubscribeUrl(member.uuid, { newsletterUuid });
         },
         required: true, // Used in email headers
+        trusted: true, // Server-generated URL, must not be HTML-escaped
       },
       // Unique ID used for ad images to bypass ESP image proxies
       {
@@ -1007,6 +1014,7 @@ class EmailRenderer {
         getValue: () => {
           return crypto.randomUUID();
         },
+        trusted: true, // Server-generated identifier
       },
     ];
 
@@ -1043,6 +1051,7 @@ class EmailRenderer {
             getValue: fallback
               ? (member) => definition.getValue(member) || fallback
               : definition.getValue,
+            trusted: definition.trusted === true,
           });
         }
       }
@@ -1056,6 +1065,7 @@ class EmailRenderer {
           originalId: definition.id,
           token: new RegExp(`%%\\{${definition.id}\\}%%`, 'g'),
           getValue: definition.getValue,
+          trusted: definition.trusted === true,
         });
       }
     }

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

@@ -1,5 +1,4 @@
 const debug = require('@tryghost/debug')('i18n');
-const logging = require('@tryghost/logging');
 const url = require('../../api/endpoints/utils/serializers/output/utils/url');
 const events = require('../../lib/common/events');
 
@@ -55,12 +54,6 @@ class EmailServiceWrapper {
     const emailAnalyticsJobs = require('../email-analytics/jobs');
     const { cachedImageSizeFromUrl } = require('../../lib/image');
 
-    // capture errors from mailgun client and log them in sentry
-    const errorHandler = (error) => {
-      logging.info(`Capturing error for mailgun email provider service`);
-      sentry.captureException(error);
-    };
-
     // Mailgun client instance for email provider
     const mailgunClient = new MailgunClient({
       config: configService,
@@ -78,7 +71,6 @@ class EmailServiceWrapper {
     const mailgunEmailProvider = new MailgunEmailProvider({
       mailgunClient,
       config: configService,
-      errorHandler,
     });
 
     const emailRenderer = new EmailRenderer({
@@ -134,7 +126,6 @@ class EmailServiceWrapper {
       db,
       sentry,
       getRequiredUrlRelations,
-      debugStorageFilePath: configService.getContentPath('data'),
     });
 
     if (ghostServer) {

package/core/server/services/email-service/mailgun-email-provider.js

@@ -1,6 +1,7 @@
 const logging = require('@tryghost/logging');
 const errors = require('@tryghost/errors');
 const debug = require('@tryghost/debug')('email-service:mailgun-provider-service');
+const { escapeExpression } = require('handlebars');
 
 /**
  * @typedef {object} Config
@@ -35,35 +36,41 @@ const debug = require('@tryghost/debug')('email-service:mailgun-provider-service
 class MailgunEmailProvider {
   #mailgunClient;
   #config;
-  #errorHandler;
 
   /**
    * @param {object} dependencies
    * @param {import('../lib/mailgun-client')} dependencies.mailgunClient - mailgun client to send emails
    * @param {Config} dependencies.config
-   * @param {Function} [dependencies.errorHandler] - custom error handler for logging exceptions
    */
-  constructor({ mailgunClient, config, errorHandler }) {
+  constructor({ mailgunClient, config }) {
     this.#mailgunClient = mailgunClient;
     this.#config = config;
-    this.#errorHandler = errorHandler;
   }
 
-  #createRecipientData(replacements) {
+  #createRecipientData(replacements, htmlEscapedIds) {
     let recipientData = {};
 
     recipientData = replacements.reduce((acc, replacement) => {
       const { id, value } = replacement;
       acc[id] = value;
+      // Mailgun's recipient-variables substitution is a simple string replace with
+      // no HTML awareness, and the same value is used for both the html and plaintext
+      // bodies. Member-controlled values get an extra, escaped variant that only the
+      // html body points at. Trusted server-generated values (urls, uuids, hmacs) are
+      // skipped so their URLs don't end up entity-encoded inside hrefs.
+      if (htmlEscapedIds.has(id)) {
+        acc[`${id}_html`] = typeof value === 'string' ? escapeExpression(value) : value;
+      }
       return acc;
     }, {});
 
     return recipientData;
   }
 
-  #updateRecipientVariables(data, replacementDefinitions) {
+  #updateRecipientVariables(data, replacementDefinitions, isHtml) {
     for (const def of replacementDefinitions) {
-      data = data.replace(def.token, `%recipient.${def.id}%`);
+      const useHtmlVariant = isHtml && !def.trusted;
+      data = data.replace(def.token, `%recipient.${def.id}${useHtmlVariant ? '_html' : ''}%`);
     }
     return data;
   }
@@ -128,8 +135,11 @@ class MailgunEmailProvider {
       }
 
       // create recipient data for Mailgun using replacement definitions
+      const htmlEscapedIds = new Set(
+        replacementDefinitions.filter((def) => !def.trusted).map((def) => def.id),
+      );
       const recipientData = recipients.reduce((acc, recipient) => {
-        acc[recipient.email] = this.#createRecipientData(recipient.replacements);
+        acc[recipient.email] = this.#createRecipientData(recipient.replacements, htmlEscapedIds);
         return acc;
       }, {});
 
@@ -139,6 +149,7 @@ class MailgunEmailProvider {
           messageData[key] = this.#updateRecipientVariables(
             messageData[key],
             replacementDefinitions,
+            key === 'html',
           );
         }
       });
@@ -165,7 +176,7 @@ class MailgunEmailProvider {
           message: this.#createMailgunErrorMessage(error),
           errorDetails: JSON.stringify({ error, messageData }),
           context: `Mailgun Error ${error.status}: ${error.details}`,
-          help: `https://ghost.org/docs/newsletters/#bulk-email-configuration`,
+          help: `https://docs.ghost.org/newsletters/#bulk-email-configuration`,
           code: 'BULK_EMAIL_SEND_FAILED',
         });
       } else {

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/email-templates/gift-delivery.hbs

@@ -31,9 +31,9 @@
                     <tr>
                       <td align="left" style="padding-bottom: 22px; text-align: left;">
                         {{#if siteIconUrl}}
-                          <a href="{{siteUrl}}"><img src="{{siteIconUrl}}" alt="{{siteTitle}}" border="0" width="48" height="48" style="border-radius: 4px;"></a>
+                          <img src="{{siteIconUrl}}" alt="{{siteTitle}}" border="0" width="48" height="48" style="border-radius: 4px;">
                         {{else}}
-                          <a href="{{siteUrl}}" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 17px; font-weight: 700; color: {{accentColor}}; text-decoration: none;">{{siteTitle}}</a>
+                          <span style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 17px; font-weight: 700; color: {{accentColor}};">{{siteTitle}}</span>
                         {{/if}}
                       </td>
                     </tr>
@@ -92,7 +92,7 @@
                     </tr>
                     <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; padding-top: 40px;">
-                        <p class="small" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 16px; font-size: 11px; color: #738A94; font-weight: normal; margin: 0;">{{t 'This message was sent from {siteDomain} to {email} on behalf of {buyerName} ({buyerEmail}).' siteDomain=(linkTag siteUrl siteDomain class="small" style="text-decoration: underline; color: #738A94; font-size: 11px;") email=(linkTag (mailto toEmail) toEmail class="small" style="text-decoration: underline; color: #738A94; font-size: 11px;") buyerName=buyerName buyerEmail=(linkTag (mailto buyerEmail) buyerEmail class="small" style="text-decoration: underline; color: #738A94; font-size: 11px;")}}</p>
+                        <p class="small" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; line-height: 16px; font-size: 11px; color: #738A94; font-weight: normal; margin: 0;">{{t 'This message was sent from {siteDomain} to {email} on behalf of {buyerName} ({buyerEmail}).' siteDomain=siteDomain email=toEmail buyerName=buyerName buyerEmail=buyerEmail}}</p>
                       </td>
                     </tr>
                   </table>

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-email-service.js

@@ -182,7 +182,6 @@ class GiftEmailService {
         const giftLink = `${siteUrl.replace(/\/$/, '')}/gift/${token}`;
         const { html, text } = await this.renderer.renderDelivery({
             siteTitle,
-            siteUrl,
             siteIconUrl: this.blogIcon.getIconUrl({ absolute: true, fallbackToDefault: false }),
             siteDomain,
             accentColor: this.accentColor,

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/gifts/index.js

@@ -14,7 +14,7 @@ const send_gift_delivery_event_1 = require("./events/send-gift-delivery-event");
 // Persistent scheduling adapters keep their queue across restarts and opt out
 // of boot-time rebuilds (same contract post scheduling honours in boot.js).
 let rescheduleDeliveriesOnBoot = true;
-async function init(options) {
+function init(options) {
     if (exports.service) {
         return;
     }
@@ -37,7 +37,7 @@ async function init(options) {
     const labsService = require('../../../shared/labs');
     const urlUtils = require('../../../shared/url-utils').default;
     const settingsHelpers = require('../settings-helpers');
-    const EmailAddressParser = require('../email-address/email-address-parser');
+    const emailAddressParser = require('../email-address/email-address-parser');
     const { blogIcon } = require('../../../server/lib/image');
     const { t } = require('../i18n');
     const repository = new gift_bookshelf_repository_1.GiftBookshelfRepository({
@@ -57,7 +57,7 @@ async function init(options) {
         bulkMailer: new MailgunClient({ config, settings: settingsCache }),
         settingsCache,
         urlUtils,
-        getFromAddress: () => EmailAddressParser.stringify(settingsHelpers.getDefaultEmail()),
+        getFromAddress: () => emailAddressParser.stringify(settingsHelpers.getDefaultEmail()),
         getReplyToAddress: () => settingsHelpers.getMembersSupportAddress(),
         blogIcon,
         t,

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

@@ -1,6 +1,6 @@
 const path = require('path');
 const logging = require('@tryghost/logging');
-const jobsService = require('../../jobs');
+const jobManager = require('../../jobs');
 const CleanGiftsJob = require('./clean-gifts-job').default;
 
 let hasScheduled = {
@@ -31,7 +31,7 @@ function scheduleJob(key, name, jobFile) {
   const at = randomOffPeakDailyCron();
 
   logging.info(`[Background Job] ${name} scheduled at ${at}`);
-  jobsService.addJob({
+  jobManager.addJob({
     at,
     job: path.resolve(__dirname, jobFile),
     name,
@@ -43,14 +43,14 @@ function scheduleJob(key, name, jobFile) {
 }
 
 module.exports = {
-  async scheduleGiftCleanupJob(classBasedJobs) {
+  async scheduleGiftCleanupJob(jobsService) {
     if (alreadyScheduledOrTest('cleanup')) {
       return;
     }
 
     const cron = randomOffPeakDailyCron();
     logging.info(`[Background Job] clean-gifts scheduled at ${cron}`);
-    await classBasedJobs.scheduleRecurring(new CleanGiftsJob(), { cron });
+    await jobsService.scheduleRecurring(new CleanGiftsJob(), { cron });
 
     hasScheduled.cleanup = true;
   },

package/core/server/services/indexnow-ping/indexnow-ping-service.js

@@ -160,7 +160,7 @@ class IndexNowPingService {
                     err,
                     message: err.message,
                     context: (0, tpl_1.default)(constants_1.messages.requestFailedError, { service: 'IndexNow' }),
-                    help: (0, tpl_1.default)(constants_1.messages.requestFailedHelp, { url: 'https://ghost.org/docs/' }),
+                    help: (0, tpl_1.default)(constants_1.messages.requestFailedHelp, { url: 'https://docs.ghost.org/' }),
                 }),
             };
         }
@@ -181,7 +181,7 @@ class IndexNowPingService {
                 err,
                 message: err.message,
                 context: (0, tpl_1.default)(constants_1.messages.requestFailedError, { service: 'IndexNow' }),
-                help: (0, tpl_1.default)(constants_1.messages.requestFailedHelp, { url: 'https://ghost.org/docs/' }),
+                help: (0, tpl_1.default)(constants_1.messages.requestFailedHelp, { url: 'https://docs.ghost.org/' }),
             }),
         };
     }

package/core/server/services/invitations/accept.js

@@ -30,7 +30,9 @@ async function accept(invitation) {
       throw new errors.NotFoundError({ message: tpl(messages.inviteExpired) });
     }
 
-    let user = await models.User.findOne({ email: data.email }, options);
+    const email = invite.get('email');
+
+    let user = await models.User.findOne({ email }, options);
     if (user) {
       throw new errors.ValidationError({
         message: tpl(messages.inviteEmailAlreadyExist.message),
@@ -45,7 +47,7 @@ async function accept(invitation) {
 
     await models.User.add(
       {
-        email: data.email,
+        email,
         name: data.name,
         password: data.password,
         roles: [roleId],

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

@@ -9,22 +9,13 @@ const models = require('../../models');
 const sentry = require('../../../shared/sentry');
 const domainEvents = require('@tryghost/domain-events');
 const config = require('../../../shared/config');
-const WorkerModelEventBridge = require('./worker-model-event-bridge');
 const errorHandler = (error, workerMeta) => {
   logging.error(error, `[Background Job] ${workerMeta.name} failed`);
   sentry.captureException(error);
 };
 const events = require('../../lib/common/events');
-const workerModelEventBridge = new WorkerModelEventBridge({ models, events, logging, sentry });
 
 const workerMessageHandler = ({ name, message }) => {
-  if (workerModelEventBridge.isModelEventMessage(message)) {
-    // Carries its own `eventName` rather than job-manager's reserved `event` key,
-    // so it routes through the bridge instead of being dispatched as a raw domain event.
-    workerModelEventBridge.handle(message, { jobName: name });
-    return;
-  }
-
   if (typeof message === 'string' && !['done', 'cancelled'].includes(message)) {
     logging.info(`[Background Job] ${name}: ${message}`);
   }