ghost 6.54.1 → 6.55.0

package/core/server/services/automations/database-automations-repository.js

@@ -9,11 +9,13 @@ const tpl_1 = __importDefault(require("@tryghost/tpl"));
 const node_crypto_1 = __importDefault(require("node:crypto"));
 const bson_objectid_1 = __importDefault(require("bson-objectid"));
 const dequal_1 = require("dequal");
-const moment_1 = __importDefault(require("moment"));
+// @ts-expect-error This module currently lacks type definitions.
+const lexical_1 = __importDefault(require("../../lib/lexical"));
+const url_utils_1 = __importDefault(require("../../../shared/url-utils"));
 const constants_1 = require("../member-welcome-emails/constants");
+const database_date_1 = require("./database-date");
 const stale_lock_cutoff_1 = require("./stale-lock-cutoff");
 const HOUR_MS = 60 * 60 * 1000;
-const DATABASE_DATE_FORMAT = 'YYYY-MM-DD HH:mm:ss';
 const DEFAULT_WELCOME_EMAIL_AUTOMATIONS = [{
         name: 'Free member welcome flow',
         slug: constants_1.MEMBER_WELCOME_EMAIL_SLUGS.free
@@ -28,9 +30,6 @@ const messages = {
     defaultEmailDesignSettingNotFound: 'Default automated email design setting not found.'
 };
 const DEFAULT_EMAIL_DESIGN_SETTING_REFERENCE = constants_1.DEFAULT_EMAIL_DESIGN_SETTING_SLUG;
-function toDatabaseDate(date) {
-    return (0, moment_1.default)(date).format(DATABASE_DATE_FORMAT);
-}
 function createDatabaseAutomationsRepository({ knex, fakeWaitHoursMultiplier }) {
     return {
         async browse() {
@@ -54,6 +53,33 @@ function createDatabaseAutomationsRepository({ knex, fakeWaitHoursMultiplier })
                 return await buildAutomation(trx, automation);
             });
         },
+        async getAutomationActionLinks(automationId, actionId) {
+            const action = await knex('automation_actions')
+                .select('id')
+                .where({
+                id: actionId,
+                automation_id: automationId
+            })
+                .whereNull('deleted_at')
+                .first();
+            if (!action) {
+                return null;
+            }
+            const rows = await knex('redirects as redirects')
+                .countDistinct({ clicked_count: 'members_click_events.member_id' })
+                .select(knex.raw('MIN(??) as ??', ['redirects.to', 'url']))
+                .innerJoin('automation_action_revisions as revisions', 'revisions.id', 'redirects.automation_action_revision_id')
+                .leftJoin('members_click_events', 'members_click_events.redirect_id', 'redirects.id')
+                .where('revisions.action_id', actionId)
+                .whereNotNull('redirects.to_hash')
+                .groupBy('redirects.to_hash')
+                .orderBy('clicked_count', 'desc')
+                .orderBy('url', 'asc');
+            return rows.map(row => ({
+                url: url_utils_1.default.transformReadyToAbsolute(row.url),
+                clicked_count: Number(row.clicked_count)
+            }));
+        },
         async edit(id, data) {
             return await knex.transaction(async (trx) => {
                 const automation = await loadAutomation(trx, id);
@@ -64,7 +90,7 @@ function createDatabaseAutomationsRepository({ knex, fakeWaitHoursMultiplier })
                 const updatedAutomation = await updateAutomation(trx, {
                     ...automation,
                     status: data.status,
-                    updated_at: toDatabaseDate(now)
+                    updated_at: (0, database_date_1.toDatabaseDate)(now)
                 });
                 await replaceAutomationGraph(trx, updatedAutomation.id, data.actions, data.edges);
                 if (updatedAutomation.status === 'inactive') {
@@ -101,7 +127,7 @@ function createDatabaseAutomationsRepository({ knex, fakeWaitHoursMultiplier })
                     .update({
                     email_sent_count: trx.raw('COALESCE(??, 0) + ?', ['email_sent_count', 1])
                 });
-                const now = toDatabaseDate(new Date());
+                const now = (0, database_date_1.toDatabaseDate)(new Date());
                 await trx('automated_email_recipients').insert({
                     id: (0, bson_objectid_1.default)().toHexString(),
                     member_id: options.memberId,
@@ -162,6 +188,48 @@ function createDatabaseAutomationsRepository({ knex, fakeWaitHoursMultiplier })
                     });
                 }
             });
+        },
+        async trackEmailClicked({ automationActionRevisionId, memberId, clickedAt }, { transacting } = {}) {
+            const trackClick = async (trx) => {
+                // Match recordEmailSent's lock order to avoid deadlocks.
+                await trx('automation_action_revisions')
+                    .select('id')
+                    .where({ id: automationActionRevisionId })
+                    .forUpdate()
+                    .first();
+                const recipient = await trx('automated_email_recipients')
+                    .select('id', 'clicked_at')
+                    .where({
+                    automation_action_revision_id: automationActionRevisionId,
+                    member_id: memberId,
+                    track_clicks: true
+                })
+                    .where('created_at', '<=', (0, database_date_1.toDatabaseDate)(clickedAt))
+                    .orderBy('created_at', 'desc')
+                    .orderBy('id', 'desc')
+                    .forUpdate()
+                    .first();
+                if (!recipient || recipient.clicked_at !== null) {
+                    return;
+                }
+                const updated = await trx('automated_email_recipients')
+                    .where({ id: recipient.id })
+                    .whereNull('clicked_at')
+                    .update({ clicked_at: clickedAt });
+                if (updated === 0) {
+                    return;
+                }
+                await trx('automation_action_revisions')
+                    .where({ id: automationActionRevisionId })
+                    .update({
+                    email_clicked_count: trx.raw('COALESCE(email_clicked_count, 0) + 1')
+                });
+            };
+            if (transacting) {
+                await trackClick(transacting);
+                return;
+            }
+            await knex.transaction(trackClick);
         }
     };
 }
@@ -194,7 +262,7 @@ async function ensureDefaultAutomations(trx) {
     }
 }
 async function ensureAutomation(trx, defaults) {
-    const now = toDatabaseDate(new Date());
+    const now = (0, database_date_1.toDatabaseDate)(new Date());
     const id = (0, bson_objectid_1.default)().toHexString();
     await trx('automations')
         .insert({
@@ -233,7 +301,7 @@ async function ensureWelcomeEmailAction(trx, automationId) {
     if (!email) {
         return;
     }
-    const now = toDatabaseDate(new Date());
+    const now = (0, database_date_1.toDatabaseDate)(new Date());
     const actionId = (0, bson_objectid_1.default)().toHexString();
     await insertActions(trx, [{
             id: actionId,
@@ -263,7 +331,7 @@ async function trigger(trx, options) {
         return;
     }
     const now = new Date();
-    const nowString = toDatabaseDate(now);
+    const nowString = (0, database_date_1.toDatabaseDate)(now);
     const readyAt = getReadyAtForAction(firstAction, now, fakeWaitHoursMultiplier);
     const run = {
         id: (0, bson_objectid_1.default)().toHexString(),
@@ -282,14 +350,14 @@ async function trigger(trx, options) {
     });
 }
 async function insertRunStep(trx, { automationRunId, automationActionRevisionId, now, readyAt }) {
-    const nowString = toDatabaseDate(now);
+    const nowString = (0, database_date_1.toDatabaseDate)(now);
     await trx('automation_run_steps').insert({
         id: (0, bson_objectid_1.default)().toHexString(),
         created_at: nowString,
         updated_at: nowString,
         automation_run_id: automationRunId,
         automation_action_revision_id: automationActionRevisionId,
-        ready_at: toDatabaseDate(readyAt)
+        ready_at: (0, database_date_1.toDatabaseDate)(readyAt)
     });
 }
 async function fetchAndLockSteps(trx, limit) {
@@ -304,9 +372,9 @@ async function fetchAndLockSteps(trx, limit) {
     // 2. Try to lock those rows.
     // 3. Select any rows we successfully locked.
     const now = new Date();
-    const nowString = toDatabaseDate(now);
+    const nowString = (0, database_date_1.toDatabaseDate)(now);
     const staleLockCutoff = (0, stale_lock_cutoff_1.getStaleLockCutoff)(now);
-    const staleLockCutoffString = toDatabaseDate(staleLockCutoff);
+    const staleLockCutoffString = (0, database_date_1.toDatabaseDate)(staleLockCutoff);
     const lockId = node_crypto_1.default.randomUUID();
     // 1. Select up to `limit` candidate rows.
     const candidates = await trx('automation_run_steps')
@@ -374,7 +442,7 @@ async function findNextPendingReadyAt(trx, staleLockCutoff) {
         .where((builder) => {
         builder
             .whereNull('locked_by')
-            .orWhere('locked_at', '<', toDatabaseDate(staleLockCutoff));
+            .orWhere('locked_at', '<', (0, database_date_1.toDatabaseDate)(staleLockCutoff));
     })
         .orderBy('ready_at')
         .first();
@@ -479,7 +547,7 @@ async function findNextActionRevision(trx, sourceActionId) {
     return row ?? null;
 }
 async function markStepTerminal(trx, step, status) {
-    const nowString = toDatabaseDate(new Date());
+    const nowString = (0, database_date_1.toDatabaseDate)(new Date());
     return await updateStep(trx, step, {
         status,
         finished_at: nowString,
@@ -491,12 +559,12 @@ async function retryStep(trx, step, retryAt) {
         await markStepTerminal(trx, step, 'automation disabled');
         return false;
     }
-    const nowString = toDatabaseDate(new Date());
+    const nowString = (0, database_date_1.toDatabaseDate)(new Date());
     return await updateStep(trx, step, {
         status: 'pending',
         started_at: null,
         finished_at: null,
-        ready_at: toDatabaseDate(retryAt),
+        ready_at: (0, database_date_1.toDatabaseDate)(retryAt),
         updated_at: nowString
     });
 }
@@ -521,8 +589,8 @@ function getReadyAtForAction(action, now, fakeWaitHoursMultiplier) {
     }
 }
 async function cancelCancelablePendingStepsForAutomation(trx, automationId, now) {
-    const nowString = toDatabaseDate(now);
-    const staleLockCutoff = toDatabaseDate((0, stale_lock_cutoff_1.getStaleLockCutoff)(now));
+    const nowString = (0, database_date_1.toDatabaseDate)(now);
+    const staleLockCutoff = (0, database_date_1.toDatabaseDate)((0, stale_lock_cutoff_1.getStaleLockCutoff)(now));
     await trx('automation_run_steps')
         .update({
         status: 'automation disabled',
@@ -626,11 +694,11 @@ async function updateAutomation(trx, automation) {
 async function replaceAutomationGraph(trx, automationId, submittedActions, edges) {
     const existingActions = await loadAutomationActionRows(trx, automationId);
     const existingActionById = new Map(existingActions.map(action => [action.id, action]));
-    const actions = await resolveEmailDesignSettingIds(trx, submittedActions);
+    const actions = (await resolveEmailDesignSettingIds(trx, submittedActions)).map(formatActionOnWrite);
     const submittedActionIds = new Set(actions.map(action => action.id));
     const actionIdsWithOwners = await loadActionIdsWithOwners(trx, [...submittedActionIds]);
     const latestRevisionByActionId = new Map((await loadLatestActionRevisions(trx, [...submittedActionIds])).map(revision => [revision.action_id, revision]));
-    const now = toDatabaseDate(new Date());
+    const now = (0, database_date_1.toDatabaseDate)(new Date());
     const actionsToInsert = [];
     const revisionsToInsert = [];
     for (const action of actions) {
@@ -680,6 +748,21 @@ async function replaceAutomationGraph(trx, automationId, submittedActions, edges
     await deleteAutomationEdges(trx, automationId);
     await insertActionEdges(trx, edges);
 }
+function formatActionOnWrite(action) {
+    if (action.type !== 'send_email') {
+        return action;
+    }
+    return {
+        ...action,
+        data: {
+            ...action.data,
+            email_lexical: url_utils_1.default.lexicalToTransformReady(action.data.email_lexical, {
+                nodes: lexical_1.default.nodes,
+                transformMap: lexical_1.default.urlTransformMap
+            })
+        }
+    };
+}
 async function resolveEmailDesignSettingIds(trx, actions) {
     if (!actions.some(action => action.type === 'send_email' && action.data.email_design_setting_id === DEFAULT_EMAIL_DESIGN_SETTING_REFERENCE)) {
         return [...actions];
@@ -793,14 +876,14 @@ async function insertActionRevisions(trx, revisions) {
 }
 function getNextRevisionCreatedAt(latestCreatedAt, requestedCreatedAt) {
     if (!latestCreatedAt) {
-        return toDatabaseDate(requestedCreatedAt);
+        return (0, database_date_1.toDatabaseDate)(requestedCreatedAt);
     }
     const requestedTime = new Date(requestedCreatedAt).getTime();
     const latestTime = new Date(latestCreatedAt).getTime();
     if (requestedTime > latestTime) {
-        return toDatabaseDate(requestedCreatedAt);
+        return (0, database_date_1.toDatabaseDate)(requestedCreatedAt);
     }
-    return toDatabaseDate(new Date(latestTime + 1000));
+    return (0, database_date_1.toDatabaseDate)(new Date(latestTime + 1000));
 }
 function buildActionRevision(actionId, action, createdAt) {
     switch (action.type) {
@@ -946,7 +1029,7 @@ function buildActionPayload(row, stats) {
                 type: 'send_email',
                 data: {
                     email_subject: requireValue(row, 'email_subject'),
-                    email_lexical: requireValue(row, 'email_lexical'),
+                    email_lexical: url_utils_1.default.transformReadyToAbsolute(requireValue(row, 'email_lexical')),
                     email_design_setting_id: requireValue(row, 'email_design_setting_id')
                 },
                 stats: stats ?? EMPTY_EMAIL_STATS

package/core/server/services/automations/database-automations-repository.ts

@@ -4,7 +4,9 @@ import crypto from 'node:crypto';
 import ObjectId from 'bson-objectid';
 import {dequal} from 'dequal';
 import {type Knex} from 'knex';
-import moment from 'moment';
+// @ts-expect-error This module currently lacks type definitions.
+import lexicalLib from '../../lib/lexical';
+import urlUtils from '../../../shared/url-utils';
 import {DEFAULT_EMAIL_DESIGN_SETTING_SLUG, MEMBER_WELCOME_EMAIL_SLUGS} from '../member-welcome-emails/constants';
 import type {
     AutomatedEmailEvents,
@@ -19,11 +21,11 @@ import type {
     EditAutomationData,
     Page
 } from './automations-repository';
+import {toDatabaseDate} from './database-date';
 import {getStaleLockCutoff} from './stale-lock-cutoff';
 import type {ExclusifyUnion, ReadonlyDeep} from 'type-fest';
 
 const HOUR_MS = 60 * 60 * 1000;
-const DATABASE_DATE_FORMAT = 'YYYY-MM-DD HH:mm:ss';
 const DEFAULT_WELCOME_EMAIL_AUTOMATIONS = [{
     name: 'Free member welcome flow',
     slug: MEMBER_WELCOME_EMAIL_SLUGS.free
@@ -50,9 +52,6 @@ interface AutomationRow {
     updated_at: string;
 }
 
-function toDatabaseDate(date: Date | string): string {
-    return moment(date).format(DATABASE_DATE_FORMAT);
-}
 
 interface ActionRow {
     id: string;
@@ -70,6 +69,11 @@ type ActionStatsRow = {
     email_opened_count: number | null;
 };
 
+type ActionLinkRow = {
+    url: string;
+    clicked_count: string | number;
+};
+
 type ActionRevisionRow = {
     action_id: string;
     created_at: string;
@@ -166,6 +170,37 @@ export function createDatabaseAutomationsRepository({
             });
         },
 
+        async getAutomationActionLinks(automationId, actionId) {
+            const action = await knex('automation_actions')
+                .select('id')
+                .where({
+                    id: actionId,
+                    automation_id: automationId
+                })
+                .whereNull('deleted_at')
+                .first();
+
+            if (!action) {
+                return null;
+            }
+
+            const rows = await knex('redirects as redirects')
+                .countDistinct({clicked_count: 'members_click_events.member_id'})
+                .select<ActionLinkRow[]>(knex.raw('MIN(??) as ??', ['redirects.to', 'url']))
+                .innerJoin('automation_action_revisions as revisions', 'revisions.id', 'redirects.automation_action_revision_id')
+                .leftJoin('members_click_events', 'members_click_events.redirect_id', 'redirects.id')
+                .where('revisions.action_id', actionId)
+                .whereNotNull('redirects.to_hash')
+                .groupBy('redirects.to_hash')
+                .orderBy('clicked_count', 'desc')
+                .orderBy('url', 'asc');
+
+            return rows.map(row => ({
+                url: urlUtils.transformReadyToAbsolute(row.url),
+                clicked_count: Number(row.clicked_count)
+            }));
+        },
+
         async edit(id: string, data: EditAutomationData): Promise<Automation | null> {
             return await knex.transaction(async (trx) => {
                 const automation = await loadAutomation(trx, id);
@@ -304,6 +339,57 @@ export function createDatabaseAutomationsRepository({
                         });
                 }
             });
+        },
+
+        async trackEmailClicked({automationActionRevisionId, memberId, clickedAt}, {transacting} = {}) {
+            const trackClick = async (trx: Knex.Transaction) => {
+                // Match recordEmailSent's lock order to avoid deadlocks.
+                await trx('automation_action_revisions')
+                    .select('id')
+                    .where({id: automationActionRevisionId})
+                    .forUpdate()
+                    .first();
+
+                const recipient = await trx('automated_email_recipients')
+                    .select('id', 'clicked_at')
+                    .where({
+                        automation_action_revision_id: automationActionRevisionId,
+                        member_id: memberId,
+                        track_clicks: true
+                    })
+                    .where('created_at', '<=', toDatabaseDate(clickedAt))
+                    .orderBy('created_at', 'desc')
+                    .orderBy('id', 'desc')
+                    .forUpdate()
+                    .first();
+
+                if (!recipient || recipient.clicked_at !== null) {
+                    return;
+                }
+
+                const updated = await trx('automated_email_recipients')
+                    .where({id: recipient.id})
+                    .whereNull('clicked_at')
+                    .update({clicked_at: clickedAt});
+
+                if (updated === 0) {
+                    return;
+                }
+
+                await trx('automation_action_revisions')
+                    .where({id: automationActionRevisionId})
+                    .update({
+                        email_clicked_count: trx.raw('COALESCE(email_clicked_count, 0) + 1')
+                    });
+
+            };
+
+            if (transacting) {
+                await trackClick(transacting);
+                return;
+            }
+
+            await knex.transaction(trackClick);
         }
     };
 }
@@ -921,7 +1007,7 @@ async function updateAutomation(trx: Knex.Transaction, automation: AutomationRow
 async function replaceAutomationGraph(trx: Knex.Transaction, automationId: string, submittedActions: AutomationAction[], edges: AutomationEdge[]): Promise<void> {
     const existingActions = await loadAutomationActionRows(trx, automationId);
     const existingActionById = new Map(existingActions.map(action => [action.id, action]));
-    const actions = await resolveEmailDesignSettingIds(trx, submittedActions);
+    const actions = (await resolveEmailDesignSettingIds(trx, submittedActions)).map(formatActionOnWrite);
     const submittedActionIds = new Set(actions.map(action => action.id));
     const actionIdsWithOwners = await loadActionIdsWithOwners(trx, [...submittedActionIds]);
     const latestRevisionByActionId = new Map((await loadLatestActionRevisions(trx, [...submittedActionIds])).map(revision => [revision.action_id, revision]));
@@ -982,6 +1068,23 @@ async function replaceAutomationGraph(trx: Knex.Transaction, automationId: strin
     await insertActionEdges(trx, edges);
 }
 
+function formatActionOnWrite(action: AutomationAction): AutomationAction {
+    if (action.type !== 'send_email') {
+        return action;
+    }
+
+    return {
+        ...action,
+        data: {
+            ...action.data,
+            email_lexical: urlUtils.lexicalToTransformReady(action.data.email_lexical, {
+                nodes: lexicalLib.nodes,
+                transformMap: lexicalLib.urlTransformMap
+            })
+        }
+    };
+}
+
 async function resolveEmailDesignSettingIds(trx: Knex.Transaction, actions: ReadonlyArray<AutomationAction>): Promise<AutomationAction[]> {
     if (!actions.some(action => action.type === 'send_email' && action.data.email_design_setting_id === DEFAULT_EMAIL_DESIGN_SETTING_REFERENCE)) {
         return [...actions];
@@ -1312,7 +1415,7 @@ function buildActionPayload(row: ActionRow, stats: AutomationEmailStats | null):
             type: 'send_email',
             data: {
                 email_subject: requireValue(row, 'email_subject'),
-                email_lexical: requireValue(row, 'email_lexical'),
+                email_lexical: urlUtils.transformReadyToAbsolute(requireValue(row, 'email_lexical')),
                 email_design_setting_id: requireValue(row, 'email_design_setting_id')
             },
             stats: stats ?? EMPTY_EMAIL_STATS

package/core/server/services/automations/database-date.js

@@ -0,0 +1,10 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.toDatabaseDate = void 0;
+const moment_1 = __importDefault(require("moment"));
+const DATABASE_DATE_FORMAT = 'YYYY-MM-DD HH:mm:ss';
+const toDatabaseDate = (date) => (0, moment_1.default)(date).format(DATABASE_DATE_FORMAT);
+exports.toDatabaseDate = toDatabaseDate;

package/core/server/services/automations/database-date.ts

@@ -0,0 +1,5 @@
+import moment from 'moment';
+
+const DATABASE_DATE_FORMAT = 'YYYY-MM-DD HH:mm:ss';
+
+export const toDatabaseDate = (date: Date | string): string => moment(date).format(DATABASE_DATE_FORMAT);

package/core/server/services/automations/poll.js

@@ -12,6 +12,7 @@ const constants_2 = require("./constants");
 // @ts-expect-error Models currently lack type definitions.
 const models_1 = require("../../models");
 const settingsCache = require('../../../shared/settings-cache');
+const labs = require('../../../shared/labs');
 const slugToMemberStatus = new Map(Object.entries(constants_1.MEMBER_WELCOME_EMAIL_SLUGS).map(([status, slug]) => [slug, status]));
 const hasUpdatesAndAnnouncementsEnabled = (member) => {
     const preference = member.get('enable_updates_and_announcements');
@@ -112,7 +113,7 @@ const processStep = async ({ automationsApi, memberWelcomeEmailService, schedule
                     break;
                 }
                 memberWelcomeEmailService.init();
-                const trackClicks = Boolean(settingsCache.get('email_track_clicks'));
+                const trackClicks = labs.isSet('automationAnalytics') && Boolean(settingsCache.get('email_track_clicks'));
                 const trackOpens = Boolean(settingsCache.get('email_track_opens'));
                 const sendResult = await memberWelcomeEmailService.api.sendAutomationEmail({
                     email: {
@@ -126,7 +127,9 @@ const processStep = async ({ automationsApi, memberWelcomeEmailService, schedule
                         uuid: member.get('uuid')
                     },
                     memberStatus,
-                    trackOpens
+                    trackOpens,
+                    trackClicks,
+                    automationActionRevisionId: step.automation_action_revision_id
                 });
                 const mailgunMessageId = (0, mailgun_message_id_1.getMailgunMessageId)(sendResult);
                 // Only Mailgun sends can produce open events for automation emails

package/core/server/services/automations/poll.ts

@@ -8,6 +8,7 @@ import {MAX_ATTEMPTS, MAX_STEPS_PER_BATCH, RETRY_DELAY_MS} from './constants';
 import {Member} from '../../models';
 
 const settingsCache = require('../../../shared/settings-cache');
+const labs = require('../../../shared/labs');
 
 type MemberWelcomeEmailService = {
     init: () => unknown;
@@ -25,6 +26,8 @@ type MemberWelcomeEmailService = {
             };
             memberStatus: 'free' | 'paid';
             trackOpens: boolean;
+            trackClicks: boolean;
+            automationActionRevisionId: string;
         }) => Promise<unknown>;
     };
 };
@@ -183,7 +186,7 @@ const processStep = async ({
                 break;
             }
             memberWelcomeEmailService.init();
-            const trackClicks = Boolean(settingsCache.get('email_track_clicks'));
+            const trackClicks = labs.isSet('automationAnalytics') && Boolean(settingsCache.get('email_track_clicks'));
             const trackOpens = Boolean(settingsCache.get('email_track_opens'));
             const sendResult = await memberWelcomeEmailService.api.sendAutomationEmail({
                 email: {
@@ -197,7 +200,9 @@ const processStep = async ({
                     uuid: member.get('uuid')
                 },
                 memberStatus,
-                trackOpens
+                trackOpens,
+                trackClicks,
+                automationActionRevisionId: step.automation_action_revision_id
             });
             const mailgunMessageId = getMailgunMessageId(sendResult);
             // Only Mailgun sends can produce open events for automation emails

package/core/server/services/automations/scheduler-poll-time.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSchedulerPollTime = void 0;
+const SCHEDULER_POLL_INTERVAL_MS = 15 * 60 * 1000;
+/**
+ * An implementation of the [FNV-1a hash][0].
+ *
+ * We need something that generates per-site jitter within a 15-minute
+ * interval. We want a 32-bit number which we can modulo at the end.
+ *
+ * FNV-1a is good for this purpose because:
+ *
+ * - it is simple
+ * - it generates a 32-bit number
+ * - it is [more efficient than CRC32, MD5, and SHA][1], using less CPU and RAM
+ *
+ * This implementation assumes ASCII strings, which we expect callers to always
+ * use. If that assumption is ever violated, we'll compute incorrect jitter,
+ * which is acceptable.
+ *
+ * [0]: https://en.wikipedia.org/wiki/Fowler%E2%80%93Noll%E2%80%93Vo_hash_function#FNV-1a_hash
+ * [1]: https://gist.github.com/EvanHahn/20d845c8157691d24977831159487950
+ */
+const fnv1a32 = (asciiStr) => {
+    let hash = 0x811c9dc5;
+    for (let i = 0; i < asciiStr.length; i++) {
+        hash ^= asciiStr.charCodeAt(i);
+        hash = Math.imul(hash, 0x01000193);
+    }
+    return hash >>> 0;
+};
+/**
+ * Round the time up to a 15-minute interval with site-specific jitter.
+ */
+const getSchedulerPollTime = (date, siteIdentifier) => {
+    const siteOffset = fnv1a32(siteIdentifier) % SCHEDULER_POLL_INTERVAL_MS;
+    const interval = Math.ceil((date.getTime() - siteOffset) / SCHEDULER_POLL_INTERVAL_MS);
+    return new Date(interval * SCHEDULER_POLL_INTERVAL_MS + siteOffset);
+};
+exports.getSchedulerPollTime = getSchedulerPollTime;

package/core/server/services/automations/scheduler-poll-time.ts

@@ -0,0 +1,38 @@
+const SCHEDULER_POLL_INTERVAL_MS = 15 * 60 * 1000;
+
+/**
+ * An implementation of the [FNV-1a hash][0].
+ *
+ * We need something that generates per-site jitter within a 15-minute
+ * interval. We want a 32-bit number which we can modulo at the end.
+ *
+ * FNV-1a is good for this purpose because:
+ *
+ * - it is simple
+ * - it generates a 32-bit number
+ * - it is [more efficient than CRC32, MD5, and SHA][1], using less CPU and RAM
+ *
+ * This implementation assumes ASCII strings, which we expect callers to always
+ * use. If that assumption is ever violated, we'll compute incorrect jitter,
+ * which is acceptable.
+ *
+ * [0]: https://en.wikipedia.org/wiki/Fowler%E2%80%93Noll%E2%80%93Vo_hash_function#FNV-1a_hash
+ * [1]: https://gist.github.com/EvanHahn/20d845c8157691d24977831159487950
+ */
+const fnv1a32 = (asciiStr: string): number => {
+    let hash = 0x811c9dc5;
+    for (let i = 0; i < asciiStr.length; i++) {
+        hash ^= asciiStr.charCodeAt(i);
+        hash = Math.imul(hash, 0x01000193);
+    }
+    return hash >>> 0;
+};
+
+/**
+ * Round the time up to a 15-minute interval with site-specific jitter.
+ */
+export const getSchedulerPollTime = (date: Readonly<Date>, siteIdentifier: string): Date => {
+    const siteOffset = fnv1a32(siteIdentifier) % SCHEDULER_POLL_INTERVAL_MS;
+    const interval = Math.ceil((date.getTime() - siteOffset) / SCHEDULER_POLL_INTERVAL_MS);
+    return new Date(interval * SCHEDULER_POLL_INTERVAL_MS + siteOffset);
+}