ghost 6.64.0 → 6.65.0

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

@@ -2,6 +2,7 @@ const logging = require('@tryghost/logging');
 const ObjectID = require('bson-objectid').default;
 const errors = require('@tryghost/errors');
 const tpl = require('@tryghost/tpl');
+const SendEmailJob = require('./jobs/send-email-job').default;
 const messages = {
   emailErrorPartialFailure:
     'An error occurred, and your newsletter was only partially sent. Please retry sending the remaining emails.',
@@ -17,7 +18,7 @@ const SHUTDOWN_CODE = 'BULK_EMAIL_SHUTDOWN_IN_PROGRESS';
  * @typedef {import('./email-renderer')} EmailRenderer
  * @typedef {import('./domain-warming-service').DomainWarmingService} DomainWarmingService
  * @typedef {import('./email-renderer').MemberLike} MemberLike
- * @typedef {object} JobsService
+ * @typedef {import('../jobs-service/jobs-service').JobsService} JobsService
  * @typedef {object} Email
  * @typedef {object} Newsletter
  * @typedef {object} Post
@@ -188,23 +189,20 @@ class BatchSendingService {
   }
 
   /**
-   * Schedules a background job that sends the email in the background if it is pending or failed.
+   * Dispatches the job that sends the email; the job itself only proceeds if the email
+   * is pending or failed.
+   * Resolves when dispatch completes, not when the email is sent.
    * @param {Email} email
-   * @returns {void}
+   * @returns {Promise<void>}
    */
-  scheduleEmail(email) {
+  async scheduleEmail(email) {
+    await this.#jobsService.dispatch(new SendEmailJob({ emailId: email.id }));
     logging.info(`[Background Job] batch-sending-service-job queued for email ${email.id}`);
-    return this.#jobsService.addJob({
-      name: 'batch-sending-service-job',
-      job: this.emailJob.bind(this),
-      data: { emailId: email.id },
-      offloaded: false,
-    });
   }
 
   /**
-   * @private
-   * @param {{emailId: string}} data Data passed from the job service. We only need the emailId because we need to refetch the email anyway to make sure the status is right and 'locked'.
+   * Sends an email after refetching it and acquiring its status lock.
+   * @param {{emailId: string}} data Identifier of the email to refetch and lock.
    */
   async emailJob({ emailId }) {
     logging.info(`[Background Job] batch-sending-service-job started for email ${emailId}`);
@@ -270,6 +268,7 @@ class BatchSendingService {
         { ...this.#getAfterRetryConfig(), description: `email ${emailId} -> submitted` },
       );
       logging.info(
+        { system: { event: 'send_email.submitted', email_id: emailId } },
         `[Background Job] batch-sending-service-job completed for email ${emailId} in ${Date.now() - startTime}ms`,
       );
     } catch (e) {
@@ -820,7 +819,7 @@ class BatchSendingService {
     let succeeded = false;
 
     try {
-      let members = await this.retryDb(
+      const members = await this.retryDb(
         async () => {
           const m = await this.getBatchMembers(batch.id);
 
@@ -958,7 +957,7 @@ class BatchSendingService {
    * @returns {Promise<MemberLike[]>}
    */
   async getBatchMembers(batchId) {
-    let models = await this.#models.EmailRecipient.findAll({
+    const models = await this.#models.EmailRecipient.findAll({
       filter: `batch_id:'${batchId}'`,
       withRelated: ['member', 'member.stripeSubscriptions', 'member.products'],
     });

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

@@ -65,6 +65,19 @@ function escapeHtml(unsafe) {
     .replace(/'/g, ''');
 }
 
+/**
+ * @param {string} html
+ * @returns {string}
+ */
+function fixOutlookChars(html) {
+  return html
+    .replace(/'/g, ''')
+    .replace(/→/g, '→')
+    .replace(/–/g, '–')
+    .replace(/“/g, '“')
+    .replace(/”/g, '”');
+}
+
 /**
  * @param {string} locale
  * @returns {boolean}
@@ -754,23 +767,52 @@ class EmailRenderer {
     // Convert DOM back to HTML
     html = $.html(); // () Fix for vscode syntax highlighter
 
+    // Personalize the entire name row after CSS inlining so an absent name also
+    // removes its label and markup, including in clients that discard stylesheets.
+    const nameRow = $('.subscription-details .subscription-name');
+    const nameHtml = nameRow.length ? $.html(nameRow) : '';
+    const nameText = nameRow.text();
+    const plaintextHtml = nameHtml
+      ? html.replace(nameHtml, '<p>%%{subscription_name_text}%%</p>')
+      : html;
+    if (nameHtml) {
+      html = html.replace(nameHtml, '%%{subscription_name_html}%%');
+    }
+
     // Replacement strings
     const replacementDefinitions = this.buildReplacementDefinitions({
       html,
       newsletterUuid: newsletter.get('uuid'),
     });
 
+    if (nameHtml) {
+      const outlookNameHtml = fixOutlookChars(nameHtml);
+      replacementDefinitions.push(
+        {
+          id: 'subscription_name_html',
+          token: /%%\{subscription_name_html\}%%/g,
+          getValue: (member) =>
+            member.name?.trim()
+              ? outlookNameHtml.replace('%%{name}%%', () => escapeHtml(member.name))
+              : '',
+          trusted: true, // Member name is already HTML-escaped
+        },
+        {
+          id: 'subscription_name_text',
+          token: /%%\{subscription_name_text\}%%/g,
+          getValue: (member) =>
+            member.name?.trim() ? nameText.replace('%%{name}%%', () => member.name) : '',
+        },
+      );
+    }
+
     // TODO: normalizeReplacementStrings (replace unsupported replacement strings)
 
     // Convert HTML to plaintext
-    const plaintext = htmlToPlaintext.email(html);
+    const plaintext = htmlToPlaintext.email(plaintextHtml);
 
     // Fix any unsupported chars in Outlook
-    html = html.replace(/&apos;/g, '&#39;');
-    html = html.replace(/→/g, '&rarr;');
-    html = html.replace(/–/g, '&ndash;');
-    html = html.replace(/“/g, '&ldquo;');
-    html = html.replace(/”/g, '&rdquo;');
+    html = fixOutlookChars(html);
 
     return {
       html,
@@ -813,7 +855,7 @@ class EmailRenderer {
   isMemberTrialing(member) {
     // Do we have an active subscription?
     if (member.status === 'paid') {
-      let activeSubscription = member.subscriptions.find((subscription) => {
+      const activeSubscription = member.subscriptions.find((subscription) => {
         return subscription.status === 'trialing';
       });
 
@@ -965,12 +1007,6 @@ class EmailRenderer {
           return member.name;
         },
       },
-      {
-        id: 'name_class',
-        getValue: (member) => {
-          return member.name ? '' : 'hidden';
-        },
-      },
       {
         id: 'email',
         getValue: (member) => {
@@ -1183,7 +1219,7 @@ class EmailRenderer {
    */
   #getEmailPreheader(postModel, audience, html) {
     let plaintext = postModel.get('plaintext');
-    let customExcerpt = postModel.get('custom_excerpt');
+    const customExcerpt = postModel.get('custom_excerpt');
     if (customExcerpt) {
       return customExcerpt;
     } else {

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

@@ -1,3 +1,4 @@
+const assert = require('node:assert/strict');
 const debug = require('@tryghost/debug')('i18n');
 const url = require('../../api/endpoints/utils/serializers/output/utils/url');
 const events = require('../../lib/common/events');
@@ -14,10 +15,11 @@ class EmailServiceWrapper {
     return jsonModel.url;
   }
 
-  init({ ghostServer } = {}) {
+  init({ ghostServer, jobsService } = {}) {
     if (this.service) {
       return;
     }
+    assert(jobsService, 'Email service requires the jobs service');
 
     const EmailService = require('./email-service');
     const EmailController = require('./email-controller');
@@ -36,7 +38,6 @@ class EmailServiceWrapper {
     const configService = require('../../../shared/config');
     const settingsCache = require('../../../shared/settings-cache');
     const settingsHelpers = require('../settings-helpers');
-    const jobsService = require('../jobs');
     const membersService = require('../members');
     const db = require('../../data/db');
     const sentry = require('../../../shared/sentry');

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

@@ -204,7 +204,7 @@ class EmailService {
     });
 
     try {
-      this.#batchSendingService.scheduleEmail(email);
+      await this.#batchSendingService.scheduleEmail(email);
     } catch (e) {
       await email.save(
         {
@@ -334,7 +334,7 @@ class EmailService {
     logging.warn(`Email resume: scheduling ${email.id} for re-send ${JSON.stringify(breadcrumb)}`);
 
     // Skip checkLimits — this email already passed limits when first sent.
-    this.#batchSendingService.scheduleEmail(email);
+    await this.#batchSendingService.scheduleEmail(email);
   }
 
   async #buildResumeBreadcrumb(email) {
@@ -392,10 +392,22 @@ class EmailService {
     // so we have a immediate response when retrying an email (schedule can take a while to kick off sometimes)
     await email.save({ status: 'pending' }, { patch: true });
 
-    this.#batchSendingService.scheduleEmail(email);
+    try {
+      await this.#batchSendingService.scheduleEmail(email);
+    } catch (e) {
+      await email.save({ status: 'failed' }, { patch: true });
+      throw e;
+    }
     return email;
   }
 
+  /**
+   * @param {import('./jobs/send-email-job').default} job
+   */
+  async handleSendEmailJob(job) {
+    await this.#batchSendingService.emailJob({ emailId: job.emailId });
+  }
+
   /**
    * @params {string|null} [audienceStatus] - the audience's free/paid status
    *   ('status:free' / 'status:-free'), see EmailRenderer#describeSegment
@@ -476,11 +488,24 @@ class EmailService {
    * @return {string}
    */
   replaceDefinitions(htmlOrPlaintext, replacements, member) {
-    // Do manual replacements with an example member
-    for (const replacement of replacements) {
-      htmlOrPlaintext = htmlOrPlaintext.replace(replacement.token, replacement.getValue(member));
+    if (!replacements.length) {
+      return htmlOrPlaintext;
     }
-    return htmlOrPlaintext;
+    const values = replacements.map(({ token, getValue }) => ({ token, value: getValue(member) }));
+    const tokens = new RegExp(
+      replacements.map(({ token }) => `(?:${token.source})`).join('|'),
+      'g',
+    );
+
+    // Only match the original body, never placeholders inside inserted member data.
+    return htmlOrPlaintext.replace(tokens, (match) => {
+      for (const { token, value } of values) {
+        if (match.search(token) !== -1) {
+          return value;
+        }
+      }
+      return match;
+    });
   }
 
   /**
@@ -497,7 +522,7 @@ class EmailService {
     const exampleMember = await this.getExampleMember(null, audience.status);
 
     const subject = this.#emailRenderer.getSubject(post);
-    let { html, plaintext, replacements } = await this.#emailRenderer.renderBody(
+    const { html, plaintext, replacements } = await this.#emailRenderer.renderBody(
       post,
       newsletter,
       renderSegment,

package/core/server/services/email-service/email-templates/partials/feedback-button.hbs

@@ -1,4 +1,5 @@
-<td dir="ltr" valign="top" align="center" style="display: inline-block; box-sizing: border-box; vertical-align: top; font-family: inherit; text-align: center; padding: 0 4px 4px; cursor: pointer; width: {{#if cellWidth}}{{cellWidth}}{{else}}30%{{/if}};">
+{{!-- Keep the native table-cell display; inline display values make Firefox wrap sibling cells. --}}
+<td dir="ltr" valign="top" align="center" style="box-sizing: border-box; vertical-align: top; font-family: inherit; text-align: center; padding: 0 4px 4px; cursor: pointer; width: {{#if cellWidth}}{{cellWidth}}{{else}}30%{{/if}};">
     <a href="{{href}}" target="_blank">
         <img src={{iconUrl}} border="0" width={{width}} height={{height}} alt="{{buttonText}}" {{#if iconClass}}class="{{iconClass}}"{{/if}}>
         <p class="feedback-button-text">{{t buttonText}}</p>

package/core/server/services/email-service/email-templates/partials/styles.hbs

@@ -1176,12 +1176,6 @@ a[data-flickr-embed] img {
    }
 }
 
-@media all {
-    .subscription-details p.hidden {
-        display: none !important;
-    }
-}
-
 {{#if showBadge}}
     .footer-powered {
         text-align: center;

package/core/server/services/email-service/email-templates/template.hbs

@@ -59,7 +59,7 @@
                                         <table role="presentation" border="0" cellpadding="0" cellspacing="0" width="100%">
                                             <tr>
                                                 <td class="subscription-details">
-                                                    <p class="%%{name_class}%%">{{t 'Name'}}: %%{name, "not provided"}%%</p>
+                                                    <p class="subscription-name">{{t 'Name'}}: %%{name}%%</p>
                                                     <p>{{t 'Email'}}: <a href="#">%%{email}%%</a></p>
                                                     <p>{{t 'Member since'}}: %%{created_at}%%</p>
                                                 </td>

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

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const job_1 = require("../../jobs-service/job");
+class SendEmailJob extends job_1.Job {
+    static type = 'send-email';
+    emailId;
+    constructor({ emailId }) {
+        super();
+        this.emailId = emailId;
+    }
+}
+exports.default = SendEmailJob;

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

@@ -30,7 +30,7 @@ const { escapeExpression } = require('handlebars');
 
 /**
  * @typedef {object} EmailProviderSuccessResponse
- * @prop {string} id
+ * @prop {string|null} id Null when the batch carries a per-recipient Message-Id
  */
 
 class MailgunEmailProvider {
@@ -134,6 +134,11 @@ class MailgunEmailProvider {
         messageData.deliveryTime = options.deliveryTime;
       }
 
+      // only newsletters opt in; automation and gift emails rely on the id Mailgun returns
+      if (this.#config.get('bulkEmail:perRecipientMessageId') === true) {
+        messageData.perRecipientMessageId = true;
+      }
+
       // create recipient data for Mailgun using replacement definitions
       const htmlEscapedIds = new Set(
         replacementDefinitions.filter((def) => !def.trusted).map((def) => def.id),
@@ -163,7 +168,7 @@ class MailgunEmailProvider {
 
       // Return mailgun provider id, trim <> from response
       return {
-        id: response.id.trim().replace(/^<|>$/g, ''),
+        id: response.id === null ? null : response.id.trim().replace(/^<|>$/g, ''),
       };
     } catch (e) {
       let ghostError;

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

@@ -59,7 +59,7 @@ const logging = require('@tryghost/logging');
 
 /**
  * @typedef {object} EmailProviderSuccessResponse
- * @prop {string} id
+ * @prop {string|null} id Null when the batch carries a per-recipient Message-Id
  */
 
 class SendingService {

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

@@ -917,15 +917,13 @@ class GiftService {
         }, '[Background Job] clean-gifts finished its cleanup phases');
     }
     async processReminders() {
+        const startedAt = Date.now();
         const now = new Date();
         const toRemind = await this.deps.giftRepository.findPendingReminder({
             now,
             reminderLeadMs: GIFT_REMINDER_LEAD_MS,
             reminderFloorMs: GIFT_REMINDER_FLOOR_MS,
         });
-        if (toRemind.length === 0) {
-            return { remindedCount: 0, skippedCount: 0, failedCount: 0 };
-        }
         let remindedCount = 0;
         let skippedCount = 0;
         let failedCount = 0;
@@ -944,6 +942,17 @@ class GiftService {
                 failedCount += 1;
             }
         }
+        // The jobs service's lifecycle log carries no counts, so the poll reports
+        // its own summary here for the daily job and the exact scheduler alike.
+        logging_1.default.info({
+            system: {
+                event: 'send_gift_reminders.completed',
+                reminded_count: remindedCount,
+                skipped_count: skippedCount,
+                failed_count: failedCount,
+                duration_ms: Date.now() - startedAt,
+            },
+        }, `[Background Job] send-gift-reminders processed reminders: ${remindedCount} sent, ${skippedCount} not due, ${failedCount} rejected`);
         return { remindedCount, skippedCount, failedCount };
     }
     async sendReminderForGift(token) {

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

@@ -28,7 +28,6 @@ function init(options) {
     const { SubscriptionActivatedEvent } = require('../../../shared/events');
     const StartGiftReminderFlushEvent = require('./events/start-gift-reminder-flush-event');
     const { StartGiftDeliveryFlushEvent } = require('./events/start-gift-delivery-flush-event');
-    const jobs = require('./jobs');
     const emailAnalyticsJobs = require('../email-analytics/jobs');
     const { GhostMailer } = require('../mail');
     const MailgunClient = require('../lib/mailgun-client');
@@ -155,7 +154,6 @@ function init(options) {
             logging.error(err, `Failed to process gift delivery ${event.data.deliveryId}`);
         }
     });
-    jobs.scheduleGiftReminderJob();
 }
 // Re-arms future deliveries and retries sends interrupted by a previous
 // shutdown. Runs after all services initialise because recovery sends need

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

@@ -1,9 +1,8 @@
-const path = require('path');
 const logging = require('@tryghost/logging');
-const jobManager = require('../../jobs');
 const CleanGiftsJob = require('./clean-gifts-job').default;
+const SendGiftRemindersJob = require('./send-gift-reminders-job').default;
 
-let hasScheduled = {
+const hasScheduled = {
   cleanup: false,
   reminders: false,
 };
@@ -23,25 +22,6 @@ function randomOffPeakDailyCron() {
   return `${s} ${m} ${h} * * *`;
 }
 
-function scheduleJob(key, name, jobFile) {
-  if (alreadyScheduledOrTest(key)) {
-    return hasScheduled[key];
-  }
-
-  const at = randomOffPeakDailyCron();
-
-  logging.info(`[Background Job] ${name} scheduled at ${at}`);
-  jobManager.addJob({
-    at,
-    job: path.resolve(__dirname, jobFile),
-    name,
-  });
-
-  hasScheduled[key] = true;
-
-  return true;
-}
-
 module.exports = {
   async scheduleGiftCleanupJob(jobsService) {
     if (alreadyScheduledOrTest('cleanup')) {
@@ -55,7 +35,15 @@ module.exports = {
     hasScheduled.cleanup = true;
   },
 
-  scheduleGiftReminderJob() {
-    return scheduleJob('reminders', 'send-gift-reminders', 'send-gift-reminders-job.js');
+  async scheduleGiftReminderJob(jobsService) {
+    if (alreadyScheduledOrTest('reminders')) {
+      return;
+    }
+
+    const cron = randomOffPeakDailyCron();
+    logging.info(`[Background Job] send-gift-reminders scheduled at ${cron}`);
+    await jobsService.scheduleRecurring(new SendGiftRemindersJob(), { cron });
+
+    hasScheduled.reminders = true;
   },
 };

package/core/server/services/gifts/jobs/send-gift-reminders-job.js

@@ -1,47 +1,7 @@
-const { parentPort } = require('node:worker_threads');
-const StartGiftReminderFlushEvent = require('../events/start-gift-reminder-flush-event');
-
-// Recurring job to send gift reminder emails. The actual work runs on the
-// main thread via a domain event so we don't have to re-initialize every
-// service dependency inside this worker
-
-// Exit early when cancelled to prevent stalling shutdown. No cleanup needed
-// when cancelling as everything is idempotent - any gift that hasn't yet had
-// its reminder recorded will be picked up on the next run
-function cancel() {
-  if (parentPort) {
-    parentPort.postMessage('cancelled before completion');
-    parentPort.postMessage('cancelled');
-  } else {
-    setTimeout(() => {
-      process.exit(0);
-    }, 1000);
-  }
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const job_1 = require("../../jobs-service/job");
+class SendGiftRemindersJob extends job_1.Job {
+    static type = 'send-gift-reminders';
 }
-
-if (parentPort) {
-  parentPort.once('message', (message) => {
-    if (message === 'cancel') {
-      return cancel();
-    }
-  });
-}
-
-(async () => {
-  if (parentPort) {
-    // Bounce to the main thread via the JobManager's event bridge - the
-    // gifts service subscribes to this event and runs the work in the
-    // already-initialised main process
-    parentPort.postMessage({
-      event: {
-        type: StartGiftReminderFlushEvent.name,
-      },
-    });
-    parentPort.postMessage('dispatched to main process');
-    parentPort.postMessage('done');
-  } else {
-    setTimeout(() => {
-      process.exit(0);
-    }, 1000);
-  }
-})();
+exports.default = SendGiftRemindersJob;

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

@@ -20,7 +20,7 @@ async function accept(invitation) {
   return models.Base.transaction(async (transacting) => {
     const options = { context: { internal: true }, transacting, forUpdate: true };
 
-    let invite = await models.Invite.findOne({ token: inviteToken, status: 'sent' }, options);
+    const invite = await models.Invite.findOne({ token: inviteToken, status: 'sent' }, options);
 
     if (!invite) {
       throw new errors.NotFoundError({ message: tpl(messages.inviteNotFound) });
@@ -32,7 +32,7 @@ async function accept(invitation) {
 
     const email = invite.get('email');
 
-    let user = await models.User.findOne({ email }, options);
+    const user = await models.User.findOne({ email }, options);
     if (user) {
       throw new errors.ValidationError({
         message: tpl(messages.inviteEmailAlreadyExist.message),

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

@@ -21,33 +21,6 @@ const workerMessageHandler = ({ name, message }) => {
   }
 };
 
-const initTestMode = () => {
-  // Output job queue length every 5 seconds
-  setInterval(() => {
-    logging.warn(
-      `${jobManager.inlineQueue.length()} jobs in the queue. Idle: ${jobManager.inlineQueue.idle()}`,
-    );
-
-    const runningScheduledjobs = Object.keys(jobManager.bree.workers);
-    if (Object.keys(jobManager.bree.workers).length) {
-      logging.warn(
-        `${Object.keys(jobManager.bree.workers).length} jobs running: ${runningScheduledjobs}`,
-      );
-    }
-
-    const scheduledJobs = Object.keys(jobManager.bree.intervals);
-    if (Object.keys(jobManager.bree.intervals).length) {
-      logging.warn(
-        `${Object.keys(jobManager.bree.intervals).length} scheduled jobs: ${scheduledJobs}`,
-      );
-    }
-
-    if (runningScheduledjobs.length === 0 && scheduledJobs.length === 0) {
-      logging.warn('No scheduled or running jobs');
-    }
-  }, 5000);
-};
-
 const jobManager = new JobManager({
   errorHandler,
   workerMessageHandler,
@@ -58,4 +31,3 @@ const jobManager = new JobManager({
 });
 
 module.exports = jobManager;
-module.exports.initTestMode = initTestMode;

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

@@ -68,6 +68,11 @@ class JobsService {
         const queue = this.#queueByType.get(type);
         return queue === undefined ? undefined : { queue };
     }
+    /**
+     * Resolves when the backend's enqueue call completes, without waiting for the
+     * handler to run. Enqueue errors reject this promise. Resolution does not
+     * guarantee execution: the backend controls what happens to work during shutdown.
+     */
     async dispatch(job) {
         const envelope = this.#buildEnvelope(job);
         await this.#backend.enqueue(envelope, this.#routingFor(envelope.type));

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

@@ -40,12 +40,15 @@ exports.default = registerJobHandlers;
 const clean_tokens_job_1 = __importDefault(require("../members/jobs/clean-tokens-job"));
 const clean_expired_comped_job_1 = __importDefault(require("../members/jobs/clean-expired-comped-job"));
 const clean_gifts_job_1 = __importDefault(require("../gifts/jobs/clean-gifts-job"));
+const send_gift_reminders_job_1 = __importDefault(require("../gifts/jobs/send-gift-reminders-job"));
 const external_media_inliner_job_1 = __importDefault(require("../media-inliner/external-media-inliner-job"));
 const content_csv_import_job_1 = __importDefault(require("../content-import/jobs/content-csv-import-job"));
 const contentImport = __importStar(require("../content-import"));
+const members_import_job_1 = __importDefault(require("../members/jobs/members-import-job"));
 const update_check_job_1 = __importDefault(require("../update-check/jobs/update-check-job"));
 const process_webmention_job_1 = __importDefault(require("../mentions/process-webmention-job"));
 const send_webmentions_job_1 = __importDefault(require("../mentions/send-webmentions-job"));
+const send_email_job_1 = __importDefault(require("../email-service/jobs/send-email-job"));
 const updateCheck = require('../update-check');
 // Webmention processing fetches external pages and is triggered by
 // unauthenticated requests, so webmention jobs run in their own lane where a
@@ -54,7 +57,11 @@ const updateCheck = require('../update-check');
 // this shared declaration so none can declare the queue with a different
 // concurrency.
 const WEBMENTIONS_QUEUE = { queue: 'webmentions', concurrency: 3 };
-function registerJobHandlers({ jobsService, memberJobs, giftService, mediaInliner, mentionsController, mentionsSendingService, }) {
+// Keep newsletter sends independent of imports and other shared work. Two sends
+// can progress at once, each with its own two batch workers, so a long send or
+// retry does not hold up every other newsletter.
+const EMAIL_QUEUE = { queue: 'email', concurrency: 2 };
+function registerJobHandlers({ jobsService, memberJobs, giftService, mediaInliner, mentionsController, mentionsSendingService, membersService, emailService, }) {
     jobsService.handle(clean_tokens_job_1.default, async () => {
         await memberJobs.cleanTokens();
     });
@@ -64,12 +71,18 @@ function registerJobHandlers({ jobsService, memberJobs, giftService, mediaInline
     jobsService.handle(clean_gifts_job_1.default, async () => {
         await giftService.cleanup();
     });
+    jobsService.handle(send_gift_reminders_job_1.default, async () => {
+        await giftService.processReminders();
+    });
     jobsService.handle(external_media_inliner_job_1.default, async (job) => {
         await mediaInliner.inline(job.domains);
     });
     jobsService.handle(content_csv_import_job_1.default, async (job) => {
         await contentImport.handleJob(job);
     });
+    jobsService.handle(members_import_job_1.default, async (job) => {
+        await membersService.handleImportJob(job);
+    });
     jobsService.handle(update_check_job_1.default, async () => {
         await updateCheck({ rethrowErrors: true });
     });
@@ -79,4 +92,7 @@ function registerJobHandlers({ jobsService, memberJobs, giftService, mediaInline
     jobsService.handle(send_webmentions_job_1.default, async (job) => {
         await mentionsSendingService.sendWebmentions(job);
     }, WEBMENTIONS_QUEUE);
+    jobsService.handle(send_email_job_1.default, async (job) => {
+        await emailService.handleSendEmailJob(job);
+    }, EMAIL_QUEUE);
 }