ghost 6.1.0 → 6.3.0

package/core/built/admin/index.html

@@ -6,7 +6,7 @@
     <title>Ghost</title>
 
     
-<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22cdnUrl%22%3A%22%22%2C%22editorUrl%22%3A%22%22%2C%22rootURL%22%3A%22%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%226.1%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%2C%22editorFilename%22%3A%22koenig-lexical.umd.js%22%2C%22editorHash%22%3A%2237bd1e3e4d%22%2C%22adminXSettingsFilename%22%3A%22admin-x-settings.js%22%2C%22adminXSettingsHash%22%3A%229c120d864e%22%2C%22adminXActivitypubFilename%22%3A%22admin-x-activitypub.js%22%2C%22adminXActivitypubHash%22%3A%22d668621a75%22%2C%22postsFilename%22%3A%22posts.js%22%2C%22postsHash%22%3A%2285275dce41%22%2C%22statsFilename%22%3A%22stats.js%22%2C%22statsHash%22%3A%2231e7d6e61e%22%2C%22adminXActivitypubRemoteConfigUrl%22%3A%22%2F.ghost%2Factivitypub%2Fstable%2Fclient-config%22%7D" />
+<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22cdnUrl%22%3A%22%22%2C%22editorUrl%22%3A%22%22%2C%22rootURL%22%3A%22%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%226.3%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%2C%22editorFilename%22%3A%22koenig-lexical.umd.js%22%2C%22editorHash%22%3A%2237bd1e3e4d%22%2C%22adminXSettingsFilename%22%3A%22admin-x-settings.js%22%2C%22adminXSettingsHash%22%3A%2274f827c663%22%2C%22adminXActivitypubFilename%22%3A%22admin-x-activitypub.js%22%2C%22adminXActivitypubHash%22%3A%221e670e9cd7%22%2C%22postsFilename%22%3A%22posts.js%22%2C%22postsHash%22%3A%22c53b194bad%22%2C%22statsFilename%22%3A%22stats.js%22%2C%22statsHash%22%3A%2265427ccad3%22%2C%22adminXActivitypubRemoteConfigUrl%22%3A%22%2F.ghost%2Factivitypub%2Fstable%2Fclient-config%22%7D" />
 
     <meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1, maximum-scale=1, minimal-ui, viewport-fit=cover" />
     <meta name="pinterest" content="nopin" />
@@ -28,7 +28,7 @@
     </style>
 
     <link integrity="" rel="stylesheet" href="assets/vendor-0ede59da8efb5e28fa929557f7ff7154.css">
-    <link integrity="" rel="stylesheet" href="assets/ghost-791574a9e2efe65c88412947d2e80170.css" title="light">
+    <link integrity="" rel="stylesheet" href="assets/ghost-8ade80412a20088a4f0a9a1159f0bdba.css" title="light">
 
     
 </head>
@@ -48,8 +48,8 @@
     <div id="ember-basic-dropdown-wormhole"></div>
 
     <script src="assets/vendor-aed0068cf9b67d042dd23a6343545b7b.js"></script>
-<script src="assets/chunk.397.e5d027e53a68dff31d76.js"></script>
-<script src="assets/chunk.524.2aa0847042f20c9a2a00.js"></script>
-    <script src="assets/ghost-9c47d152972b304cab0fb982dc3fccc1.js"></script>
+<script src="assets/chunk.397.a720333cfffc99c47e71.js"></script>
+<script src="assets/chunk.524.aac61953956de04feb53.js"></script>
+    <script src="assets/ghost-1bfab97cb7f550726e894fae6650a808.js"></script>
 </body>
 </html>

package/core/frontend/helpers/ghost_head.js

@@ -64,7 +64,8 @@ function getMembersHelper(data, frontendKey, excludeList) {
             key: frontendKey,
             api: urlUtils.urlFor('api', {type: 'content'}, true),
             locale: settingsCache.get('locale') || 'en',
-            'members-signin-otc': labs.isSet('membersSigninOTC') // html.dataset converts dash-attrs to camelCase
+            'members-signin-otc': labs.isSet('membersSigninOTC'), // html.dataset converts dash-attrs to camelCase
+            'members-signin-otc-alpha': labs.isSet('membersSigninOTCAlpha') // html.dataset converts dash-attrs to camelCase
         };
         if (colorString) {
             attributes['accent-color'] = colorString;

package/core/server/api/endpoints/stats.js

@@ -514,7 +514,7 @@ const controller = {
         },
         options: [
             'order',
-            'limit', 
+            'limit',
             'date_from',
             'date_to',
             'timezone',
@@ -541,6 +541,42 @@ const controller = {
         async query(frame) {
             return await statsService.api.getTopSourcesWithRange(frame.options);
         }
+    },
+    utmGrowth: {
+        headers: {
+            cacheInvalidate: false
+        },
+        options: [
+            'utm_type',
+            'order',
+            'limit',
+            'date_from',
+            'date_to',
+            'timezone',
+            'post_id'
+        ],
+        permissions: {
+            docName: 'posts',
+            method: 'browse'
+        },
+        cache: statsService.cache,
+        generateCacheKeyData(frame) {
+            return {
+                method: 'utmGrowth',
+                options: {
+                    utm_type: frame.options.utm_type,
+                    order: frame.options.order,
+                    limit: frame.options.limit,
+                    date_from: frame.options.date_from,
+                    date_to: frame.options.date_to,
+                    timezone: frame.options.timezone,
+                    post_id: frame.options.post_id
+                }
+            };
+        },
+        async query(frame) {
+            return await statsService.api.getUtmGrowthStats(frame.options);
+        }
     }
 
 };

package/core/server/api/endpoints/utils/serializers/input/utils/settings-key-group-mapper.js

@@ -3,6 +3,7 @@ const keyGroupMapping = {
     members_public_key: 'core',
     members_private_key: 'core',
     members_email_auth_secret: 'core',
+    members_otc_secret: 'core',
     db_hash: 'core',
     next_update_check: 'core',
     notifications: 'core',

package/core/server/api/endpoints/utils/serializers/input/utils/settings-key-type-mapper.js

@@ -31,6 +31,7 @@ const keyTypeMapping = {
     members_public_key: 'string',
     members_private_key: 'string',
     members_email_auth_secret: 'string',
+    members_otc_secret: 'string',
     default_content_visibility: 'string',
     stripe_secret_key: 'string',
     stripe_publishable_key: 'string',

package/core/server/data/migrations/utils/schema.js

@@ -11,7 +11,7 @@ const {createNonTransactionalMigration, createTransactionalMigration} = require(
  *
  * @returns {Migration}
  */
-function createAddColumnMigration(table, column, columnDefinition) {
+function createAddColumnMigration(table, column, columnDefinition, options = {}) {
     return createNonTransactionalMigration(
         // up
         commands.createColumnMigration({
@@ -20,7 +20,8 @@ function createAddColumnMigration(table, column, columnDefinition) {
             dbIsInCorrectState: hasColumn => hasColumn === true,
             operation: commands.addColumn,
             operationVerb: 'Adding',
-            columnDefinition
+            columnDefinition,
+            options
         }),
         // down
         commands.createColumnMigration({
@@ -29,7 +30,8 @@ function createAddColumnMigration(table, column, columnDefinition) {
             dbIsInCorrectState: hasColumn => hasColumn === false,
             operation: commands.dropColumn,
             operationVerb: 'Removing',
-            columnDefinition
+            columnDefinition,
+            options
         })
     );
 }
@@ -41,7 +43,7 @@ function createAddColumnMigration(table, column, columnDefinition) {
  *
  * @returns {Migration}
  */
-function createDropColumnMigration(table, column, columnDefinition) {
+function createDropColumnMigration(table, column, columnDefinition, options = {}) {
     return createNonTransactionalMigration(
         // up
         commands.createColumnMigration({
@@ -49,7 +51,9 @@ function createDropColumnMigration(table, column, columnDefinition) {
             column,
             dbIsInCorrectState: hasColumn => hasColumn === false,
             operation: commands.dropColumn,
-            operationVerb: 'Removing'
+            operationVerb: 'Removing',
+            columnDefinition,
+            options
         }),
         // down
         commands.createColumnMigration({
@@ -58,7 +62,8 @@ function createDropColumnMigration(table, column, columnDefinition) {
             dbIsInCorrectState: hasColumn => hasColumn === true,
             operation: commands.addColumn,
             operationVerb: 'Adding',
-            columnDefinition
+            columnDefinition,
+            options
         })
     );
 }

package/core/server/data/migrations/versions/6.2/2025-09-30-14-28-09-add-utm-fields.js

@@ -0,0 +1,24 @@
+const {combineNonTransactionalMigrations, createAddColumnMigration} = require('../../utils');
+
+module.exports = combineNonTransactionalMigrations(
+    // members_created_events
+    createAddColumnMigration('members_created_events', 'utm_source', {type: 'string', maxlength: 191, nullable: true}, {algorithm: 'auto'}),
+    createAddColumnMigration('members_created_events', 'utm_medium', {type: 'string', maxlength: 191, nullable: true}, {algorithm: 'auto'}),
+    createAddColumnMigration('members_created_events', 'utm_campaign', {type: 'string', maxlength: 191, nullable: true}, {algorithm: 'auto'}),
+    createAddColumnMigration('members_created_events', 'utm_term', {type: 'string', maxlength: 191, nullable: true}, {algorithm: 'auto'}),
+    createAddColumnMigration('members_created_events', 'utm_content', {type: 'string', maxlength: 191, nullable: true}, {algorithm: 'auto'}),
+
+    // members_subscription_created_events
+    createAddColumnMigration('members_subscription_created_events', 'utm_source', {type: 'string', maxlength: 191, nullable: true}, {algorithm: 'auto'}),
+    createAddColumnMigration('members_subscription_created_events', 'utm_medium', {type: 'string', maxlength: 191, nullable: true}, {algorithm: 'auto'}),
+    createAddColumnMigration('members_subscription_created_events', 'utm_campaign', {type: 'string', maxlength: 191, nullable: true}, {algorithm: 'auto'}),
+    createAddColumnMigration('members_subscription_created_events', 'utm_term', {type: 'string', maxlength: 191, nullable: true}, {algorithm: 'auto'}),
+    createAddColumnMigration('members_subscription_created_events', 'utm_content', {type: 'string', maxlength: 191, nullable: true}, {algorithm: 'auto'}),
+
+    // donation_payment_events
+    createAddColumnMigration('donation_payment_events', 'utm_source', {type: 'string', maxlength: 191, nullable: true}, {algorithm: 'auto'}),
+    createAddColumnMigration('donation_payment_events', 'utm_medium', {type: 'string', maxlength: 191, nullable: true}, {algorithm: 'auto'}),
+    createAddColumnMigration('donation_payment_events', 'utm_campaign', {type: 'string', maxlength: 191, nullable: true}, {algorithm: 'auto'}),
+    createAddColumnMigration('donation_payment_events', 'utm_term', {type: 'string', maxlength: 191, nullable: true}, {algorithm: 'auto'}),
+    createAddColumnMigration('donation_payment_events', 'utm_content', {type: 'string', maxlength: 191, nullable: true}, {algorithm: 'auto'})
+);

package/core/server/data/migrations/versions/6.3/2025-10-02-15-13-31-add-members-otc-secret-setting.js

@@ -0,0 +1,9 @@
+const {addSetting} = require('../../utils');
+const crypto = require('crypto');
+
+module.exports = addSetting({
+    key: 'members_otc_secret',
+    value: crypto.randomBytes(64).toString('hex'),
+    type: 'string',
+    group: 'core'
+});

package/core/server/data/schema/commands.js

@@ -96,8 +96,10 @@ function dropNullable(tableName, column, transaction = db.knex) {
  * @param {string} column
  * @param {import('knex').Knex.Transaction} [transaction]
  * @param {object} columnSpec
+  * @param {object} [options]
+ * @param {'inplace'|'copy'|'auto'} [options.algorithm] - MySQL only
  */
-async function addColumn(tableName, column, transaction = db.knex, columnSpec) {
+async function addColumn(tableName, column, transaction = db.knex, columnSpec, options = {}) {
     const addColumnBuilder = transaction.schema.table(tableName, function (table) {
         addTableColumn(tableName, table, column, columnSpec);
     });
@@ -114,7 +116,12 @@ async function addColumn(tableName, column, transaction = db.knex, columnSpec) {
 
         if (DatabaseInfo.isMySQL(transaction)) {
             // Guard against an ending semicolon
-            sql = sql.replace(/;\s*$/, '') + ', algorithm=copy';
+            sql = sql.replace(/;\s*$/, '');
+            if (options?.algorithm !== 'auto') {
+                // default to copy if not specified
+                const algorithm = options?.algorithm || 'copy';
+                sql += `, algorithm=${algorithm}`;
+            }
         }
 
         await transaction.raw(sql);
@@ -126,8 +133,10 @@ async function addColumn(tableName, column, transaction = db.knex, columnSpec) {
  * @param {string} column
  * @param {import('knex').Knex} [transaction]
  * @param {object} [columnSpec]
+ * @param {object} [options]
+ * @param {'inplace'|'copy'|'auto'} [options.algorithm] - MySQL only
  */
-async function dropColumn(tableName, column, transaction = db.knex, columnSpec = {}) {
+async function dropColumn(tableName, column, transaction = db.knex, columnSpec = {}, options = {}) {
     if (Object.prototype.hasOwnProperty.call(columnSpec, 'references')) {
         const [toTable, toColumn] = columnSpec.references.split('.');
         await dropForeign({fromTable: tableName, fromColumn: column, toTable, toColumn, constraintName: columnSpec.constraintName, transaction});
@@ -149,7 +158,12 @@ async function dropColumn(tableName, column, transaction = db.knex, columnSpec =
 
         if (DatabaseInfo.isMySQL(transaction)) {
             // Guard against an ending semicolon
-            sql = sql.replace(/;\s*$/, '') + ', algorithm=copy';
+            sql = sql.replace(/;\s*$/, '');
+            if (options?.algorithm !== 'auto') {
+                // default to copy if not specified
+                const algorithm = options?.algorithm || 'copy';
+                sql += `, algorithm=${algorithm}`;
+            }
         }
 
         await transaction.raw(sql);
@@ -561,7 +575,8 @@ function createColumnMigration(...migrations) {
             dbIsInCorrectState,
             operation,
             operationVerb,
-            columnDefinition
+            columnDefinition,
+            options
         } = migration;
 
         const hasColumn = await conn.schema.hasColumn(table, column);
@@ -571,7 +586,7 @@ function createColumnMigration(...migrations) {
             logging.warn(`${operationVerb} ${table}.${column} column - skipping as table is correct`);
         } else {
             logging.info(`${operationVerb} ${table}.${column} column`);
-            await operation(table, column, conn, columnDefinition);
+            await operation(table, column, conn, columnDefinition, options);
         }
     }
 

package/core/server/data/schema/default-settings/default-settings.json

@@ -60,6 +60,10 @@
             "defaultValue": null,
             "type": "string"
         },
+        "members_otc_secret": {
+            "defaultValue": null,
+            "type": "string"
+        },
         "site_uuid": {
             "defaultValue": null,
             "type": "string",

package/core/server/data/schema/schema.js

@@ -525,6 +525,7 @@ module.exports = {
         id: {type: 'string', maxlength: 24, nullable: false, primary: true},
         created_at: {type: 'dateTime', nullable: false},
         member_id: {type: 'string', maxlength: 24, nullable: false, references: 'members.id', cascadeDelete: true},
+        // attribution values from ghost-history (member attribution tracking script)
         attribution_id: {type: 'string', maxlength: 24, nullable: true, index: true},
         attribution_type: {
             type: 'string', maxlength: 50, nullable: true, validations: {
@@ -532,9 +533,16 @@ module.exports = {
             }
         },
         attribution_url: {type: 'string', maxlength: 2000, nullable: true},
+        // referrer values from browser, processed by our referrerParser library
         referrer_source: {type: 'string', maxlength: 191, nullable: true},
         referrer_medium: {type: 'string', maxlength: 191, nullable: true},
         referrer_url: {type: 'string', maxlength: 2000, nullable: true},
+        // raw values from URL query parameters
+        utm_source: {type: 'string', maxlength: 191, nullable: true},
+        utm_medium: {type: 'string', maxlength: 191, nullable: true},
+        utm_campaign: {type: 'string', maxlength: 191, nullable: true},
+        utm_term: {type: 'string', maxlength: 191, nullable: true},
+        utm_content: {type: 'string', maxlength: 191, nullable: true},
         source: {
             type: 'string', maxlength: 50, nullable: false, validations: {
                 isIn: [['member', 'import', 'system', 'api', 'admin']]
@@ -705,6 +713,7 @@ module.exports = {
         created_at: {type: 'dateTime', nullable: false},
         member_id: {type: 'string', maxlength: 24, nullable: false, references: 'members.id', cascadeDelete: true},
         subscription_id: {type: 'string', maxlength: 24, nullable: false, references: 'members_stripe_customers_subscriptions.id', cascadeDelete: true},
+        // attribution values from ghost-history (member attribution tracking script)
         attribution_id: {type: 'string', maxlength: 24, nullable: true, index: true},
         attribution_type: {
             type: 'string', maxlength: 50, nullable: true, validations: {
@@ -712,9 +721,16 @@ module.exports = {
             }
         },
         attribution_url: {type: 'string', maxlength: 2000, nullable: true},
+        // referrer values from browser, processed by our referrerParser library
         referrer_source: {type: 'string', maxlength: 191, nullable: true},
         referrer_medium: {type: 'string', maxlength: 191, nullable: true},
         referrer_url: {type: 'string', maxlength: 2000, nullable: true},
+        // raw values from URL query parameters
+        utm_source: {type: 'string', maxlength: 191, nullable: true},
+        utm_medium: {type: 'string', maxlength: 191, nullable: true},
+        utm_campaign: {type: 'string', maxlength: 191, nullable: true},
+        utm_term: {type: 'string', maxlength: 191, nullable: true},
+        utm_content: {type: 'string', maxlength: 191, nullable: true},
         batch_id: {type: 'string', maxlength: 24, nullable: true}
     },
     offer_redemptions: {
@@ -746,6 +762,7 @@ module.exports = {
         member_id: {type: 'string', maxlength: 24, nullable: true, unique: false, references: 'members.id', setNullDelete: true},
         amount: {type: 'integer', nullable: false},
         currency: {type: 'string', maxlength: 50, nullable: false},
+        // attribution values from ghost-history (member attribution tracking script)
         attribution_id: {type: 'string', maxlength: 24, nullable: true},
         attribution_type: {
             type: 'string', maxlength: 50, nullable: true, validations: {
@@ -753,9 +770,16 @@ module.exports = {
             }
         },
         attribution_url: {type: 'string', maxlength: 2000, nullable: true},
+        // referrer values from browser, processed by our referrerParser library
         referrer_source: {type: 'string', maxlength: 191, nullable: true},
         referrer_medium: {type: 'string', maxlength: 191, nullable: true},
         referrer_url: {type: 'string', maxlength: 2000, nullable: true},
+        // raw values from URL query parameters
+        utm_source: {type: 'string', maxlength: 191, nullable: true},
+        utm_medium: {type: 'string', maxlength: 191, nullable: true},
+        utm_campaign: {type: 'string', maxlength: 191, nullable: true},
+        utm_term: {type: 'string', maxlength: 191, nullable: true},
+        utm_content: {type: 'string', maxlength: 191, nullable: true},
         created_at: {type: 'dateTime', nullable: false},
         donation_message: {type: 'string', maxlength: 255, nullable: true} // https://docs.stripe.com/payments/checkout/custom-fields
     },

package/core/server/models/settings.js

@@ -57,6 +57,7 @@ function parseDefaultSettings() {
         members_public_key: () => getMembersKey('public'),
         members_private_key: () => getMembersKey('private'),
         members_email_auth_secret: () => crypto.randomBytes(64).toString('hex'),
+        members_otc_secret: () => crypto.randomBytes(64).toString('hex'),
         ghost_public_key: () => getGhostKey('public'),
         ghost_private_key: () => getGhostKey('private'),
         site_uuid: () => getOrGenerateSiteUuid()

package/core/server/services/donations/DonationBookshelfRepository.js

@@ -19,7 +19,12 @@ class DonationBookshelfRepository {
             attribution_type: event.attributionType,
             referrer_source: event.referrerSource,
             referrer_medium: event.referrerMedium,
-            referrer_url: event.referrerUrl
+            referrer_url: event.referrerUrl,
+            utm_source: event.utmSource,
+            utm_medium: event.utmMedium,
+            utm_campaign: event.utmCampaign,
+            utm_term: event.utmTerm,
+            utm_content: event.utmContent
         });
     }
 }

package/core/server/services/donations/DonationBookshelfRepository.ts

@@ -23,6 +23,11 @@ type DonationEventModelInstance = BookshelfModelInstance & {
     referrer_source: string | null;
     referrer_medium: string | null;
     referrer_url: string | null;
+    utm_source: string | null;
+    utm_medium: string | null;
+    utm_campaign: string | null;
+    utm_term: string | null;
+    utm_content: string | null;
 }
 type DonationPaymentEventBookshelfModel = BookshelfModel<DonationEventModelInstance>;
 
@@ -47,7 +52,12 @@ export class DonationBookshelfRepository implements DonationRepository {
             attribution_type: event.attributionType,
             referrer_source: event.referrerSource,
             referrer_medium: event.referrerMedium,
-            referrer_url: event.referrerUrl
+            referrer_url: event.referrerUrl,
+            utm_source: event.utmSource,
+            utm_medium: event.utmMedium,
+            utm_campaign: event.utmCampaign,
+            utm_term: event.utmTerm,
+            utm_content: event.utmContent
         });
     }
 }

package/core/server/services/donations/DonationPaymentEvent.js

@@ -15,6 +15,11 @@ class DonationPaymentEvent {
     referrerSource;
     referrerMedium;
     referrerUrl;
+    utmSource;
+    utmMedium;
+    utmCampaign;
+    utmTerm;
+    utmContent;
     constructor(data, timestamp) {
         this.timestamp = timestamp;
         this.name = data.name;
@@ -29,6 +34,11 @@ class DonationPaymentEvent {
         this.referrerSource = data.referrerSource;
         this.referrerMedium = data.referrerMedium;
         this.referrerUrl = data.referrerUrl;
+        this.utmSource = data.utmSource;
+        this.utmMedium = data.utmMedium;
+        this.utmCampaign = data.utmCampaign;
+        this.utmTerm = data.utmTerm;
+        this.utmContent = data.utmContent;
     }
     static create(data, timestamp) {
         return new DonationPaymentEvent(data, timestamp ?? new Date());

package/core/server/services/donations/DonationPaymentEvent.ts

@@ -13,6 +13,11 @@ export class DonationPaymentEvent {
     referrerSource: string | null;
     referrerMedium: string | null;
     referrerUrl: string | null;
+    utmSource: string | null;
+    utmMedium: string | null;
+    utmCampaign: string | null;
+    utmTerm: string | null;
+    utmContent: string | null;
 
     constructor(data: Omit<DonationPaymentEvent, 'timestamp'>, timestamp: Date) {
         this.timestamp = timestamp;
@@ -30,6 +35,11 @@ export class DonationPaymentEvent {
         this.referrerSource = data.referrerSource;
         this.referrerMedium = data.referrerMedium;
         this.referrerUrl = data.referrerUrl;
+        this.utmSource = data.utmSource;
+        this.utmMedium = data.utmMedium;
+        this.utmCampaign = data.utmCampaign;
+        this.utmTerm = data.utmTerm;
+        this.utmContent = data.utmContent;
     }
 
     static create(data: Omit<DonationPaymentEvent, 'timestamp'>, timestamp?: Date) {

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

@@ -1241,7 +1241,7 @@ class EmailRenderer {
                     }, true) : null
             },
             preheader: this.#getEmailPreheader(post, segment, html),
-            preheaderSpacing: '‌ '.repeat(75),
+            preheaderSpacing: `${' ͏ '.repeat(150)}${'­ '.repeat(200)}  `,
             html,
 
             post: {

package/core/server/services/lib/MailgunClient.js

@@ -67,7 +67,8 @@ module.exports = class MailgunClient {
                 subject: messageContent.subject,
                 html: messageContent.html,
                 text: messageContent.plaintext,
-                'recipient-variables': JSON.stringify(recipientData)
+                'recipient-variables': JSON.stringify(recipientData),
+                'h:Sender': message.from
             };
 
             // Do we have a custom List-Unsubscribe header set?
@@ -348,9 +349,9 @@ module.exports = class MailgunClient {
     /**
      * Returns the configured target delivery window in seconds
      * Ghost will attempt to deliver emails evenly distributed over this window
-     * 
+     *
      * Defaults to 0 (no delay) if not set
-     * 
+     *
      * @returns {number}
      */
     getTargetDeliveryWindow() {

package/core/server/services/lib/magic-link/MagicLink.js

@@ -23,7 +23,7 @@ const messages = {
  * @typedef {Object} TokenProvider<T, D>
  * @prop {(data: D) => Promise<T>} create
  * @prop {(token: T, options?: TokenValidateOptions) => Promise<D>} validate
- * @prop {(token: T) => Promise<string | null>} [getIdByToken]
+ * @prop {(token: T) => Promise<string | null>} [getRefByToken]
  * @prop {(otcRef: string, tokenValue: T) => string} [deriveOTC]
  */
 
@@ -108,7 +108,7 @@ class MagicLink {
         let otcRef = null;
         if (this.labsService?.isSet('membersSigninOTC') && otc) {
             try {
-                otcRef = await this.getIdFromToken(token);
+                otcRef = await this.getRefFromToken(token);
             } catch (err) {
                 this.sentry?.captureException?.(err);
                 otcRef = null;
@@ -135,17 +135,17 @@ class MagicLink {
     }
 
     /**
-     * getIdFromToken
+     * getRefFromToken
      *
-     * @param {Token} token - The token to get the id from
-     * @returns {Promise<string|null>} id - The id of the token
+     * @param {Token} token - The token to get the ref from
+     * @returns {Promise<string|null>} ref - The ref of the token
      */
-    async getIdFromToken(token) {
-        if (typeof this.tokenProvider.getIdByToken !== 'function') {
+    async getRefFromToken(token) {
+        if (typeof this.tokenProvider.getRefByToken !== 'function') {
             return null;
         }
 
-        const id = await this.tokenProvider.getIdByToken(token);
+        const id = await this.tokenProvider.getRefByToken(token);
         return id;
     }
 
@@ -156,7 +156,7 @@ class MagicLink {
      * @returns {Promise<string|null>} otc - The otc of the token
      */
     async getOTCFromToken(token) {
-        const tokenId = await this.getIdFromToken(token);
+        const tokenId = await this.getRefFromToken(token);
 
         if (!tokenId || typeof this.tokenProvider.deriveOTC !== 'function') {
             return null;

package/core/server/services/mail/GhostMailer.js

@@ -68,7 +68,10 @@ function createMessage(message) {
         ...message,
         ...addresses,
         generateTextFromHTML,
-        encoding
+        encoding,
+        headers: {
+            Sender: addresses.from
+        }
     };
 }