ghost 6.37.1 → 6.38.0

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

@@ -0,0 +1,63 @@
+export interface Pagination {
+    page: number;
+    pages: number;
+    limit: number | 'all';
+    total: number;
+    prev: number | null;
+    next: number | null;
+}
+
+export interface Page<T> {
+    data: T[];
+    meta: {
+        pagination: Pagination;
+    };
+}
+
+export interface WaitAction {
+    id: string;
+    type: 'wait';
+    data: {
+        wait_hours: number;
+    };
+}
+
+export interface SendEmailAction {
+    id: string;
+    type: 'send_email';
+    data: {
+        email_subject: string;
+        email_lexical: string;
+        email_sender_name: string | null;
+        email_sender_email: string | null;
+        email_sender_reply_to: string | null;
+        email_design_setting_id: string;
+    };
+}
+
+export type AutomationAction = WaitAction | SendEmailAction;
+
+export interface AutomationEdge {
+    source_action_id: string;
+    target_action_id: string;
+}
+
+export interface AutomationSummary {
+    id: string;
+    slug: string;
+    name: string;
+    status: string;
+    created_at: string;
+    updated_at: string;
+}
+
+export interface Automation extends AutomationSummary {
+    actions: AutomationAction[];
+    edges: AutomationEdge[];
+}
+
+export interface AutomationsRepository {
+    browse(): Promise<Page<AutomationSummary>>;
+    getById(id: string): Promise<Automation | null>;
+    edit(id: string, data: Pick<AutomationSummary, 'status'>): Promise<Automation | null>;
+}

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

@@ -0,0 +1,210 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createFakeDatabaseAutomationsRepository = createFakeDatabaseAutomationsRepository;
+const errors_1 = __importDefault(require("@tryghost/errors"));
+const tpl_1 = __importDefault(require("@tryghost/tpl"));
+const messages = {
+    invalidAutomationActionRevision: 'Automation action "{actionId}" of type "{actionType}" is missing required revision field "{field}".'
+};
+function createFakeDatabaseAutomationsRepository({ getDatabase }) {
+    return {
+        async browse() {
+            const database = getDatabase();
+            return withTransaction(database, () => {
+                const rows = loadAutomations(database).map(row => buildAutomationSummary(row));
+                return {
+                    data: rows,
+                    meta: {
+                        pagination: buildPagination(rows.length)
+                    }
+                };
+            });
+        },
+        async getById(id) {
+            const database = getDatabase();
+            return withTransaction(database, () => {
+                const automation = loadAutomation(database, id);
+                if (!automation) {
+                    return null;
+                }
+                return buildAutomation(database, automation);
+            });
+        },
+        async edit(id, data) {
+            const database = getDatabase();
+            return withTransaction(database, () => {
+                const automation = loadAutomation(database, id);
+                if (!automation) {
+                    return null;
+                }
+                // TODO (NY-1229): Allow updating other fields and actions/edges.
+                const updatedAutomation = updateAutomation(database, {
+                    ...automation,
+                    status: data.status,
+                    updated_at: new Date().toISOString()
+                });
+                return buildAutomation(database, updatedAutomation);
+            });
+        }
+    };
+}
+function withTransaction(database, operation) {
+    database.exec('BEGIN TRANSACTION');
+    try {
+        const result = operation();
+        database.exec('COMMIT');
+        return result;
+    }
+    catch (error) {
+        database.exec('ROLLBACK');
+        throw error;
+    }
+}
+function loadAutomation(database, automationId) {
+    const automation = database.prepare(`
+        SELECT id, slug, name, status, created_at, updated_at
+        FROM automations
+        WHERE id = ?
+    `).get(automationId);
+    return automation ?? null;
+}
+function loadAutomations(database) {
+    return database.prepare(`
+        SELECT id, slug, name, status, created_at, updated_at
+        FROM automations
+        ORDER BY created_at, id
+    `).all();
+}
+function updateAutomation(database, automation) {
+    database.prepare(`
+        UPDATE automations
+        SET status = :status,
+            updated_at = :updated_at
+        WHERE id = :id
+    `).run({
+        id: automation.id,
+        status: automation.status,
+        updated_at: automation.updated_at
+    });
+    return requireAutomation(loadAutomation(database, automation.id), automation.id);
+}
+function requireAutomation(automation, id) {
+    if (!automation) {
+        throw new errors_1.default.InternalServerError({
+            message: `Updated automation "${id}" could not be loaded.`
+        });
+    }
+    return automation;
+}
+function buildAutomation(database, automation) {
+    return {
+        ...buildAutomationSummary(automation),
+        actions: loadActionRows(database, automation.id).map(row => buildActionPayload(row)),
+        edges: loadEdgeRows(database, automation.id).map(row => buildEdgePayload(row))
+    };
+}
+function buildAutomationSummary(automation) {
+    return {
+        id: automation.id,
+        slug: automation.slug,
+        name: automation.name,
+        status: automation.status,
+        created_at: serializeDate(automation.created_at),
+        updated_at: serializeDate(automation.updated_at)
+    };
+}
+function serializeDate(date) {
+    const normalizedDate = new Date(date);
+    normalizedDate.setMilliseconds(0);
+    return normalizedDate.toISOString();
+}
+function loadActionRows(database, automationId) {
+    return database.prepare(`
+        SELECT
+            a.id AS id,
+            a.type AS type,
+            r.wait_hours AS wait_hours,
+            r.email_subject AS email_subject,
+            r.email_lexical AS email_lexical,
+            r.email_sender_name AS email_sender_name,
+            r.email_sender_email AS email_sender_email,
+            r.email_sender_reply_to AS email_sender_reply_to,
+            r.email_design_setting_id AS email_design_setting_id
+        FROM automation_actions a
+        INNER JOIN automation_action_revisions r ON r.action_id = a.id
+        WHERE a.automation_id = ?
+            AND a.deleted_at IS NULL
+            AND r.created_at = (
+                SELECT MAX(created_at)
+                FROM automation_action_revisions
+                WHERE action_id = a.id
+            )
+        ORDER BY a.created_at, a.id
+    `).all(automationId);
+}
+function loadEdgeRows(database, automationId) {
+    return database.prepare(`
+        SELECT e.source_action_id, e.target_action_id
+        FROM automation_action_edges e
+        INNER JOIN automation_actions a ON a.id = e.source_action_id
+            AND a.deleted_at IS NULL
+        WHERE a.automation_id = ?
+        ORDER BY e.source_action_id, e.target_action_id
+    `).all(automationId);
+}
+function buildActionPayload(row) {
+    switch (row.type) {
+        case 'wait':
+            return {
+                id: row.id,
+                type: 'wait',
+                data: {
+                    wait_hours: requireValue(row.wait_hours, 'wait_hours', row)
+                }
+            };
+        case 'send_email':
+            return {
+                id: row.id,
+                type: 'send_email',
+                data: {
+                    email_subject: requireValue(row.email_subject, 'email_subject', row),
+                    email_lexical: requireValue(row.email_lexical, 'email_lexical', row),
+                    email_sender_name: row.email_sender_name,
+                    email_sender_email: row.email_sender_email,
+                    email_sender_reply_to: row.email_sender_reply_to,
+                    email_design_setting_id: requireValue(row.email_design_setting_id, 'email_design_setting_id', row)
+                }
+            };
+    }
+}
+function requireValue(value, field, row) {
+    if (value === null) {
+        throw new errors_1.default.InternalServerError({
+            message: (0, tpl_1.default)(messages.invalidAutomationActionRevision, {
+                actionId: row.id,
+                actionType: row.type,
+                field
+            })
+        });
+    }
+    return value;
+}
+function buildEdgePayload(edge) {
+    return {
+        source_action_id: edge.source_action_id,
+        target_action_id: edge.target_action_id
+    };
+}
+function buildPagination(total) {
+    return {
+        page: 1,
+        pages: 1,
+        limit: 'all',
+        total,
+        prev: null,
+        next: null
+    };
+}

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

@@ -0,0 +1,273 @@
+import errors from '@tryghost/errors';
+import tpl from '@tryghost/tpl';
+import type {DatabaseSync} from 'node:sqlite';
+import type {
+    Automation,
+    AutomationAction,
+    AutomationEdge,
+    AutomationSummary,
+    AutomationsRepository,
+    Page
+} from './automations-repository';
+
+const messages = {
+    invalidAutomationActionRevision: 'Automation action "{actionId}" of type "{actionType}" is missing required revision field "{field}".'
+};
+
+interface AutomationRow {
+    id: string;
+    slug: string;
+    name: string;
+    status: string;
+    created_at: string;
+    updated_at: string;
+}
+
+interface ActionRow {
+    id: string;
+    type: 'wait' | 'send_email';
+    wait_hours: number | null;
+    email_subject: string | null;
+    email_lexical: string | null;
+    email_sender_name: string | null;
+    email_sender_email: string | null;
+    email_sender_reply_to: string | null;
+    email_design_setting_id: string | null;
+}
+
+interface EdgeRow {
+    source_action_id: string;
+    target_action_id: string;
+}
+
+export function createFakeDatabaseAutomationsRepository({
+    getDatabase
+}: {
+    getDatabase: () => DatabaseSync;
+}): AutomationsRepository {
+    return {
+        async browse(): Promise<Page<AutomationSummary>> {
+            const database = getDatabase();
+
+            return withTransaction(database, () => {
+                const rows = loadAutomations(database).map(row => buildAutomationSummary(row));
+
+                return {
+                    data: rows,
+                    meta: {
+                        pagination: buildPagination(rows.length)
+                    }
+                };
+            });
+        },
+
+        async getById(id: string): Promise<Automation | null> {
+            const database = getDatabase();
+            return withTransaction(database, () => {
+                const automation = loadAutomation(database, id);
+
+                if (!automation) {
+                    return null;
+                }
+
+                return buildAutomation(database, automation);
+            });
+        },
+
+        async edit(id: string, data: Pick<AutomationSummary, 'status'>): Promise<Automation | null> {
+            const database = getDatabase();
+
+            return withTransaction(database, () => {
+                const automation = loadAutomation(database, id);
+
+                if (!automation) {
+                    return null;
+                }
+
+                // TODO (NY-1229): Allow updating other fields and actions/edges.
+                const updatedAutomation = updateAutomation(database, {
+                    ...automation,
+                    status: data.status,
+                    updated_at: new Date().toISOString()
+                });
+
+                return buildAutomation(database, updatedAutomation);
+            });
+        }
+    };
+}
+
+function withTransaction<T>(database: DatabaseSync, operation: () => T): T {
+    database.exec('BEGIN TRANSACTION');
+
+    try {
+        const result = operation();
+        database.exec('COMMIT');
+        return result;
+    } catch (error) {
+        database.exec('ROLLBACK');
+        throw error;
+    }
+}
+
+function loadAutomation(database: DatabaseSync, automationId: string): AutomationRow | null {
+    const automation = database.prepare(`
+        SELECT id, slug, name, status, created_at, updated_at
+        FROM automations
+        WHERE id = ?
+    `).get(automationId) as AutomationRow | undefined;
+
+    return automation ?? null;
+}
+
+function loadAutomations(database: DatabaseSync): AutomationRow[] {
+    return database.prepare(`
+        SELECT id, slug, name, status, created_at, updated_at
+        FROM automations
+        ORDER BY created_at, id
+    `).all() as unknown as AutomationRow[];
+}
+
+function updateAutomation(database: DatabaseSync, automation: AutomationRow): AutomationRow {
+    database.prepare(`
+        UPDATE automations
+        SET status = :status,
+            updated_at = :updated_at
+        WHERE id = :id
+    `).run({
+        id: automation.id,
+        status: automation.status,
+        updated_at: automation.updated_at
+    });
+
+    return requireAutomation(loadAutomation(database, automation.id), automation.id);
+}
+
+function requireAutomation(automation: AutomationRow | null, id: string): AutomationRow {
+    if (!automation) {
+        throw new errors.InternalServerError({
+            message: `Updated automation "${id}" could not be loaded.`
+        });
+    }
+
+    return automation;
+}
+
+function buildAutomation(database: DatabaseSync, automation: AutomationRow): Automation {
+    return {
+        ...buildAutomationSummary(automation),
+        actions: loadActionRows(database, automation.id).map(row => buildActionPayload(row)),
+        edges: loadEdgeRows(database, automation.id).map(row => buildEdgePayload(row))
+    };
+}
+
+function buildAutomationSummary(automation: AutomationRow): AutomationSummary {
+    return {
+        id: automation.id,
+        slug: automation.slug,
+        name: automation.name,
+        status: automation.status,
+        created_at: serializeDate(automation.created_at),
+        updated_at: serializeDate(automation.updated_at)
+    };
+}
+
+function serializeDate(date: string) {
+    const normalizedDate = new Date(date);
+    normalizedDate.setMilliseconds(0);
+    return normalizedDate.toISOString();
+}
+
+function loadActionRows(database: DatabaseSync, automationId: string): ActionRow[] {
+    return database.prepare(`
+        SELECT
+            a.id AS id,
+            a.type AS type,
+            r.wait_hours AS wait_hours,
+            r.email_subject AS email_subject,
+            r.email_lexical AS email_lexical,
+            r.email_sender_name AS email_sender_name,
+            r.email_sender_email AS email_sender_email,
+            r.email_sender_reply_to AS email_sender_reply_to,
+            r.email_design_setting_id AS email_design_setting_id
+        FROM automation_actions a
+        INNER JOIN automation_action_revisions r ON r.action_id = a.id
+        WHERE a.automation_id = ?
+            AND a.deleted_at IS NULL
+            AND r.created_at = (
+                SELECT MAX(created_at)
+                FROM automation_action_revisions
+                WHERE action_id = a.id
+            )
+        ORDER BY a.created_at, a.id
+    `).all(automationId) as unknown as ActionRow[];
+}
+
+function loadEdgeRows(database: DatabaseSync, automationId: string): EdgeRow[] {
+    return database.prepare(`
+        SELECT e.source_action_id, e.target_action_id
+        FROM automation_action_edges e
+        INNER JOIN automation_actions a ON a.id = e.source_action_id
+            AND a.deleted_at IS NULL
+        WHERE a.automation_id = ?
+        ORDER BY e.source_action_id, e.target_action_id
+    `).all(automationId) as unknown as EdgeRow[];
+}
+
+function buildActionPayload(row: ActionRow): AutomationAction {
+    switch (row.type) {
+    case 'wait':
+        return {
+            id: row.id,
+            type: 'wait',
+            data: {
+                wait_hours: requireValue(row.wait_hours, 'wait_hours', row)
+            }
+        };
+    case 'send_email':
+        return {
+            id: row.id,
+            type: 'send_email',
+            data: {
+                email_subject: requireValue(row.email_subject, 'email_subject', row),
+                email_lexical: requireValue(row.email_lexical, 'email_lexical', row),
+                email_sender_name: row.email_sender_name,
+                email_sender_email: row.email_sender_email,
+                email_sender_reply_to: row.email_sender_reply_to,
+                email_design_setting_id: requireValue(row.email_design_setting_id, 'email_design_setting_id', row)
+            }
+        };
+    }
+}
+
+function requireValue<T>(value: T | null, field: string, row: ActionRow): T {
+    if (value === null) {
+        throw new errors.InternalServerError({
+            message: tpl(messages.invalidAutomationActionRevision, {
+                actionId: row.id,
+                actionType: row.type,
+                field
+            })
+        });
+    }
+
+    return value;
+}
+
+function buildEdgePayload(edge: EdgeRow): AutomationEdge {
+    return {
+        source_action_id: edge.source_action_id,
+        target_action_id: edge.target_action_id
+    };
+}
+
+function buildPagination(total: number) {
+    return {
+        page: 1,
+        pages: 1,
+        limit: 'all' as const,
+        total,
+        prev: null,
+        next: null
+    };
+}

package/core/server/services/automations/temporary-fake-database.js

@@ -20,6 +20,7 @@ function createTemporaryFakeAutomationsDatabase() {
     const {DatabaseSync} = require('node:sqlite');
 
     const database = new DatabaseSync(':memory:');
+    database.exec('PRAGMA foreign_keys = ON;');
 
     const id = () => ObjectId().toHexString();
     const now = () => new Date().toISOString();
@@ -155,7 +156,7 @@ CREATE TABLE automation_run_steps (
         created_at: now(),
         updated_at: now(),
         automation_id: freeAutomationId,
-        type: 'send email'
+        type: 'send_email'
     });
     insertAction.run({
         id: freeAction3Id,
@@ -169,7 +170,7 @@ CREATE TABLE automation_run_steps (
         created_at: now(),
         updated_at: now(),
         automation_id: freeAutomationId,
-        type: 'send email'
+        type: 'send_email'
     });
     insertAction.run({
         id: paidAction1Id,
@@ -183,7 +184,7 @@ CREATE TABLE automation_run_steps (
         created_at: now(),
         updated_at: now(),
         automation_id: paidAutomationId,
-        type: 'send email'
+        type: 'send_email'
     });
     insertAction.run({
         id: paidAction3Id,
@@ -197,7 +198,7 @@ CREATE TABLE automation_run_steps (
         created_at: now(),
         updated_at: now(),
         automation_id: paidAutomationId,
-        type: 'send email'
+        type: 'send_email'
     });
 
     const insertActionRevision = database.prepare(`

package/core/server/services/gifts/email-templates/gift-purchase-confirmation.hbs

@@ -12,8 +12,7 @@
         table.body .content { padding: 0 !important; }
         table.body .container { padding: 0 !important; width: 100% !important; }
         table.body .main { border-radius: 0 !important; }
-        table.body p.large, table.body p.large a { font-size: 18px !important; }
-        table.body p.small, table.body a.small { font-size: 12px !important; }
+        table.body p.small, table.body a.small { font-size: 11px !important; }
       }
     </style>
   </head>
@@ -40,47 +39,26 @@
                     {{/if}}
                     <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;">
-                        <h1 style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 26px; color: #15212A; font-weight: bold; line-height: 28px; margin: 0; padding-bottom: 12px;">Your gift is ready to&nbsp;share!</h1>
-                        <p style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 16px; color: #3A464C; font-weight: normal; margin: 0; padding-bottom: 24px;">Thank you for supporting {{siteTitle}}. Send the link below to share your gift with whoever you'd like.</p>
-                        <table width="100%" border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; table-layout: fixed; width: 100%; min-width: 100%; box-sizing: border-box; background: #F4F5F6; border-radius: 8px;">
+                        <h1 style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 26px; color: #15212A; font-weight: bold; line-height: 28px; margin: 0; padding-bottom: 16px;">Your gift is ready</h1>
+                        <p style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 16px; color: #3A464C; font-weight: normal; line-height: 24px; margin: 0; padding-bottom: 24px;">Thanks for supporting {{siteTitle}}. Share the link below to give someone access to <strong>{{gift.tierName}}</strong> membership for <strong>{{gift.cadenceLabel}}</strong>.</p>
+                        <table width="100%" border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; table-layout: fixed; width: 100%; min-width: 100%; box-sizing: border-box; background: #F4F5F6; border-radius: 6px;">
                           <tbody>
                             <tr>
-                              <td align="left" style="padding: 24px;">
-                                <table border="0" cellpadding="0" cellspacing="0">
-                                  <tr>
-                                    <td style="padding-right: 8px; background-color: #F4F5F6; text-align: left; vertical-align: middle;" valign="middle">
-                                      <p style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; margin: 0; padding-bottom: 4px; color: #15171A; font-weight: 700;">Gift subscription</p>
-                                      <p class="large" style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 18px; margin: 0; padding-bottom: 24px; color: #15171A; font-weight: 400;">{{gift.tierName}} &bull; {{gift.cadenceLabel}}</p>
-                                      <p style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; margin: 0; padding-bottom: 4px; color: #15171A; font-weight: 700;">Gift link</p>
-                                      <p style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; margin: 0; padding-bottom: 0; color: #738A94; word-break: break-all;"><a href="{{gift.link}}" style="color: {{accentColor}}; text-decoration: none;">{{gift.link}}</a></p>
-                                    </td>
-                                  </tr>
-                                </table>
+                              <td align="left" style="padding: 14px 16px;">
+                                <p style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 15px; line-height: 22px; color: #15212A; margin: 0; word-break: break-all;">{{gift.link}}</p>
                               </td>
                             </tr>
                           </tbody>
                         </table>
-
-                        <!-- EXPIRY NOTE -->
-                        <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; padding-top: 16px;">
-                          <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;">
-                              <p style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 13px; margin: 0; padding-bottom: 0; color: #738A94;">This link expires on {{gift.expiresAt}} and can be redeemed once by anyone who isn't already a paid member of {{siteTitle}}.</p>
-                            </td>
-                          </tr>
-                        </table>
+                        <p style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 16px; color: #3A464C; font-weight: normal; line-height: 24px; margin: 0; padding-top: 24px; padding-bottom: 24px;">The link can be redeemed once and expires on <strong>{{gift.expiresAt}}</strong>.</p>
+                        <p style="font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol'; font-size: 16px; color: #3A464C; font-weight: normal; line-height: 24px; margin: 0;">Happy gifting.</p>
                       </td>
                     </tr>
 
                     <!-- START FOOTER -->
                     <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: 12px; vertical-align: top; padding-top: 56px;">
-                        <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: 18px; font-size: 12px; color: #7C8B9A; font-weight: normal; margin: 0;">This message was sent from <a class="small" href="{{siteUrl}}" style="text-decoration: underline; color: #7C8B9A; font-size: 12px;">{{siteDomain}}</a> to <a class="small" href="mailto:{{toEmail}}" style="text-decoration: underline; color: #7C8B9A; font-size: 12px;">{{toEmail}}</a></p>
-                      </td>
-                    </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: 12px; vertical-align: top;">
-                        <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: 18px; font-size: 12px; color: #7C8B9A; font-weight: normal; margin: 0;">You received this email because you purchased a gift subscription on <a class="small" href="{{siteUrl}}" style="text-decoration: underline; color: #7C8B9A; font-size: 12px;">{{siteTitle}}</a>.</p>
+                      <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: 80px;">
+                        <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;">This message was sent from <a class="small" href="{{siteUrl}}" style="text-decoration: underline; color: #738A94; font-size: 11px;">{{siteDomain}}</a> to <a class="small" href="mailto:{{toEmail}}" style="text-decoration: underline; color: #738A94; font-size: 11px;">{{toEmail}}</a>.</p>
                       </td>
                     </tr>