ghost 6.1.0 → 6.2.0

package/core/built/admin/assets/posts/posts.js

@@ -39837,8 +39837,8 @@ const RY = ({ children: e, className: t, ...a }) => /* @__PURE__ */ A.jsx(
     t === "same" && "text-gray-700 bg-muted"
   );
   return /* @__PURE__ */ A.jsxs("div", { className: "relative flex flex-col items-start gap-2 lg:flex-row lg:gap-3", children: [
-    /* @__PURE__ */ A.jsx("div", { className: "text-[2.2rem] font-semibold leading-none tracking-tighter", children: e }),
-    t && t !== "hidden" && /* @__PURE__ */ A.jsx(A.Fragment, { children: /* @__PURE__ */ A.jsxs("div", { className: n, children: [
+    /* @__PURE__ */ A.jsx("div", { className: "text-[2.2rem] font-semibold leading-none tracking-tighter", "data-testid": "kpi-card-header-value", children: e }),
+    t && t !== "hidden" && /* @__PURE__ */ A.jsx(A.Fragment, { children: /* @__PURE__ */ A.jsxs("div", { className: n, "data-testid": "kpi-card-header-diff", children: [
       /* @__PURE__ */ A.jsx("span", { className: "font-medium leading-none", children: a }),
       t === "up" && /* @__PURE__ */ A.jsx(ni, { className: "!size-[12px]", size: 14, strokeWidth: 2 }),
       t === "down" && /* @__PURE__ */ A.jsx(oi, { className: "!size-[12px]", size: 14, strokeWidth: 2 }),
@@ -119676,12 +119676,12 @@ const p_1 = "https://www.google.com/s2/favicons?domain=ghost.org&sz=64", dp1 = (
   ] });
 }, eM2 = ({ children: e, className: t, ...a }) => /* @__PURE__ */ A.jsx("section", { className: d1("flex gap-8 flex-col p-4 lg:p-8 size-full grow", t), ...a, children: e }), tM2 = ({ currentTab: e }) => /* @__PURE__ */ A.jsxs(W6, { variant: "inline-nav", children: [
   /* @__PURE__ */ A.jsx(W6.Title, { children: "Tags" }),
-  /* @__PURE__ */ A.jsx(W6.Nav, { children: /* @__PURE__ */ A.jsxs(ne1, { defaultValue: e, children: [
+  /* @__PURE__ */ A.jsx(W6.Nav, { children: /* @__PURE__ */ A.jsxs(ne1, { "data-testid": "tags-header-tabs", defaultValue: e, children: [
     /* @__PURE__ */ A.jsx(Dr, { value: "public", asChild: !0, children: /* @__PURE__ */ A.jsx(GH, { to: "/tags", children: "Public tags" }) }),
     /* @__PURE__ */ A.jsx(Dr, { value: "internal", asChild: !0, children: /* @__PURE__ */ A.jsx(GH, { to: "/tags?type=internal", children: "Internal tags" }) })
   ] }) }),
   /* @__PURE__ */ A.jsx(W6.Actions, { children: /* @__PURE__ */ A.jsx(J0, { asChild: !0, children: /* @__PURE__ */ A.jsx("a", { className: "font-bold", href: "#/tags/new", children: "New tag" }) }) })
-] }), aM2 = ({ children: e }) => /* @__PURE__ */ A.jsx(k_1, { children: /* @__PURE__ */ A.jsx("div", { className: "grid w-full grow", children: /* @__PURE__ */ A.jsx("div", { className: "flex h-full flex-col", children: e }) }) });
+] }), aM2 = ({ children: e }) => /* @__PURE__ */ A.jsx(k_1, { children: /* @__PURE__ */ A.jsx("div", { className: "grid w-full grow", children: /* @__PURE__ */ A.jsx("div", { className: "flex h-full flex-col", "data-testid": "tags-page", children: e }) }) });
 function A_1(e) {
   const a = e instanceof HTMLElement && window.getComputedStyle(e).overflowY, o = a !== "visible" && a !== "hidden";
   if (e) {
@@ -120273,14 +120273,15 @@ function mM2({
     spaceAfter: d
   };
 }
-const gp1 = ({ height: e }) => /* @__PURE__ */ A.jsx("tr", { className: "flex lg:table-row", children: /* @__PURE__ */ A.jsx("td", { className: "flex lg:table-cell", style: { height: e } }) }), MM2 = Q(function(t, a) {
+const gp1 = ({ height: e }) => /* @__PURE__ */ A.jsx("tr", { "aria-hidden": "true", className: "flex lg:table-row", children: /* @__PURE__ */ A.jsx("td", { className: "flex lg:table-cell", style: { height: e } }) }), MM2 = Q(function(t, a) {
   return /* @__PURE__ */ A.jsx(
     bl,
     {
       ref: a,
       ...t,
+      "aria-hidden": "true",
       className: "relative flex flex-col lg:table-row",
-      children: /* @__PURE__ */ A.jsx(A5, { className: "relative z-10 h-24 animate-pulse", children: /* @__PURE__ */ A.jsx("div", { className: "h-full rounded-md bg-muted" }) })
+      children: /* @__PURE__ */ A.jsx(A5, { className: "relative z-10 h-24 animate-pulse", children: /* @__PURE__ */ A.jsx("div", { className: "h-full rounded-md bg-muted", "data-testid": "loading-placeholder" }) })
     }
   );
 });
@@ -120299,62 +120300,70 @@ function bM2({
     fetchNextPage: n,
     parentRef: r
   });
-  return /* @__PURE__ */ A.jsx("div", { ref: r, children: /* @__PURE__ */ A.jsxs(pe1, { className: "flex table-fixed flex-col lg:table", children: [
-    /* @__PURE__ */ A.jsx(de1, { className: "hidden lg:!visible lg:!table-header-group", children: /* @__PURE__ */ A.jsxs(bl, { children: [
-      /* @__PURE__ */ A.jsx(R6, { className: "w-auto px-4", children: "Tag" }),
-      /* @__PURE__ */ A.jsx(R6, { className: "w-1/5 px-4", children: "Slug" }),
-      /* @__PURE__ */ A.jsx(R6, { className: "w-1/5 px-4", children: "No. of posts" }),
-      /* @__PURE__ */ A.jsx(R6, { className: "w-20 px-4" })
-    ] }) }),
-    /* @__PURE__ */ A.jsxs(fe1, { className: "flex flex-col lg:table-row-group", children: [
-      /* @__PURE__ */ A.jsx(gp1, { height: c }),
-      i.map(({ key: s, virtualItem: p, item: d, props: f }) => {
-        var h, m, M;
-        return p.index > e.length - 1 ? /* @__PURE__ */ A.jsx(MM2, { ...f }, s) : /* @__PURE__ */ A.jsxs(
-          bl,
-          {
-            ...f,
-            className: "relative grid w-full grid-cols-[1fr_5rem] items-center gap-x-4 p-2 md:grid-cols-[1fr_auto_5rem] lg:table-row lg:p-0",
-            children: [
-              /* @__PURE__ */ A.jsxs(A5, { className: "static col-start-1 col-end-1 row-start-1 row-end-1 flex min-w-0 flex-col p-0 lg:table-cell lg:w-1/2 lg:p-4 xl:w-3/5", children: [
-                /* @__PURE__ */ A.jsx(
-                  "a",
-                  {
-                    className: "block truncate pb-1 text-lg font-medium before:absolute before:inset-0 before:z-10",
-                    href: `#/tags/${d.slug}`,
-                    children: d.name
-                  }
-                ),
-                /* @__PURE__ */ A.jsx("span", { className: "block truncate text-muted-foreground", children: d.description })
-              ] }),
-              /* @__PURE__ */ A.jsx(A5, { className: "col-start-1 col-end-1 row-start-2 row-end-2 flex p-0 lg:table-cell lg:p-4", children: /* @__PURE__ */ A.jsx("span", { className: "block truncate", children: d.slug }) }),
-              /* @__PURE__ */ A.jsx(A5, { className: "col-start-1 col-end-1 row-start-3 row-end-3 flex p-0 md:col-start-2 md:col-end-2 md:row-start-1 md:row-end-3 lg:table-cell lg:p-4", children: (h = d.count) != null && h.posts ? /* @__PURE__ */ A.jsx(
-                "a",
-                {
-                  className: "relative z-10 -m-4 inline-block p-4 hover:underline",
-                  href: `#/posts?tag=${d.slug}`,
-                  children: `${R2((m = d.count) == null ? void 0 : m.posts)}  ${((M = d.count) == null ? void 0 : M.posts) === 1 ? "post" : "posts"}`
-                }
-              ) : /* @__PURE__ */ A.jsx("span", { className: "text-muted-foreground", children: "0 posts" }) }),
-              /* @__PURE__ */ A.jsx(A5, { className: "col-start-2 col-end-2 row-start-1 row-end-3 p-0 md:col-start-3 md:col-end-3 lg:table-cell lg:p-4", children: /* @__PURE__ */ A.jsx(
-                J0,
-                {
-                  "aria-hidden": "true",
-                  className: "w-12",
-                  size: "icon",
-                  tabIndex: -1,
-                  variant: "outline",
-                  children: /* @__PURE__ */ A.jsx(Dp, {})
-                }
-              ) })
-            ]
-          },
-          s
-        );
-      }),
-      /* @__PURE__ */ A.jsx(gp1, { height: l })
-    ] })
-  ] }) });
+  return /* @__PURE__ */ A.jsx("div", { ref: r, children: /* @__PURE__ */ A.jsxs(
+    pe1,
+    {
+      className: "flex table-fixed flex-col lg:table",
+      "data-testid": "tags-list",
+      children: [
+        /* @__PURE__ */ A.jsx(de1, { className: "hidden lg:!visible lg:!table-header-group", children: /* @__PURE__ */ A.jsxs(bl, { children: [
+          /* @__PURE__ */ A.jsx(R6, { className: "w-auto px-4", children: "Tag" }),
+          /* @__PURE__ */ A.jsx(R6, { className: "w-1/5 px-4", children: "Slug" }),
+          /* @__PURE__ */ A.jsx(R6, { className: "w-1/5 px-4", children: "No. of posts" }),
+          /* @__PURE__ */ A.jsx(R6, { className: "w-20 px-4" })
+        ] }) }),
+        /* @__PURE__ */ A.jsxs(fe1, { className: "flex flex-col lg:table-row-group", children: [
+          /* @__PURE__ */ A.jsx(gp1, { height: c }),
+          i.map(({ key: s, virtualItem: p, item: d, props: f }) => {
+            var h, m, M;
+            return p.index > e.length - 1 ? /* @__PURE__ */ A.jsx(MM2, { ...f }, s) : /* @__PURE__ */ A.jsxs(
+              bl,
+              {
+                ...f,
+                className: "relative grid w-full grid-cols-[1fr_5rem] items-center gap-x-4 p-2 md:grid-cols-[1fr_auto_5rem] lg:table-row lg:p-0",
+                "data-testid": "tag-list-row",
+                children: [
+                  /* @__PURE__ */ A.jsxs(A5, { className: "static col-start-1 col-end-1 row-start-1 row-end-1 flex min-w-0 flex-col p-0 lg:table-cell lg:w-1/2 lg:p-4 xl:w-3/5", children: [
+                    /* @__PURE__ */ A.jsx(
+                      "a",
+                      {
+                        className: "block truncate pb-1 text-lg font-medium before:absolute before:inset-0 before:z-10",
+                        href: `#/tags/${d.slug}`,
+                        children: d.name
+                      }
+                    ),
+                    /* @__PURE__ */ A.jsx("span", { className: "block truncate text-muted-foreground", children: d.description })
+                  ] }),
+                  /* @__PURE__ */ A.jsx(A5, { className: "col-start-1 col-end-1 row-start-2 row-end-2 flex p-0 lg:table-cell lg:p-4", children: /* @__PURE__ */ A.jsx("span", { className: "block truncate", children: d.slug }) }),
+                  /* @__PURE__ */ A.jsx(A5, { className: "col-start-1 col-end-1 row-start-3 row-end-3 flex p-0 md:col-start-2 md:col-end-2 md:row-start-1 md:row-end-3 lg:table-cell lg:p-4", children: (h = d.count) != null && h.posts ? /* @__PURE__ */ A.jsx(
+                    "a",
+                    {
+                      className: "relative z-10 -m-4 inline-block p-4 hover:underline",
+                      href: `#/posts?tag=${d.slug}`,
+                      children: `${R2((m = d.count) == null ? void 0 : m.posts)}  ${((M = d.count) == null ? void 0 : M.posts) === 1 ? "post" : "posts"}`
+                    }
+                  ) : /* @__PURE__ */ A.jsx("span", { className: "text-muted-foreground", children: "0 posts" }) }),
+                  /* @__PURE__ */ A.jsx(A5, { className: "col-start-2 col-end-2 row-start-1 row-end-3 p-0 md:col-start-3 md:col-end-3 lg:table-cell lg:p-4", children: /* @__PURE__ */ A.jsx(
+                    J0,
+                    {
+                      "aria-hidden": "true",
+                      className: "w-12",
+                      size: "icon",
+                      tabIndex: -1,
+                      variant: "outline",
+                      children: /* @__PURE__ */ A.jsx(Dp, {})
+                    }
+                  ) })
+                ]
+              },
+              s
+            );
+          }),
+          /* @__PURE__ */ A.jsx(gp1, { height: l })
+        ] })
+      ]
+    }
+  ) });
 }
 const zM2 = "TagsResponseType", vM2 = Hf2({
   dataType: zM2,

package/core/built/admin/assets/stats/stats.js

@@ -96030,8 +96030,8 @@ const EV1 = ({ children: e, className: t, ...a }) => /* @__PURE__ */ A.jsx(
     t === "same" && "text-gray-700 bg-muted"
   );
   return /* @__PURE__ */ A.jsxs("div", { className: "relative flex flex-col items-start gap-2 lg:flex-row lg:gap-3", children: [
-    /* @__PURE__ */ A.jsx("div", { className: "text-[2.2rem] font-semibold leading-none tracking-tighter", children: e }),
-    t && t !== "hidden" && /* @__PURE__ */ A.jsx(A.Fragment, { children: /* @__PURE__ */ A.jsxs("div", { className: n, children: [
+    /* @__PURE__ */ A.jsx("div", { className: "text-[2.2rem] font-semibold leading-none tracking-tighter", "data-testid": "kpi-card-header-value", children: e }),
+    t && t !== "hidden" && /* @__PURE__ */ A.jsx(A.Fragment, { children: /* @__PURE__ */ A.jsxs("div", { className: n, "data-testid": "kpi-card-header-diff", children: [
       /* @__PURE__ */ A.jsx("span", { className: "font-medium leading-none", children: a }),
       t === "up" && /* @__PURE__ */ A.jsx(Fc, { className: "!size-[12px]", size: 14, strokeWidth: 2 }),
       t === "down" && /* @__PURE__ */ A.jsx(jc, { className: "!size-[12px]", size: 14, strokeWidth: 2 }),

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.2%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%2213355f26c2%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%22cf5b4df358%22%2C%22statsFilename%22%3A%22stats.js%22%2C%22statsHash%22%3A%22f5dea8dc06%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-49475952d56ffe89bd47ab9d9c64ada8.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.d5e25bb9baf088f52499.js"></script>
+<script src="assets/chunk.524.70595796c7b8c6003a2d.js"></script>
+    <script src="assets/ghost-2066304fd0b166e1c16d397dd73ef7b2.js"></script>
 </body>
 </html>

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/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/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/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
+        }
     };
 }
 

package/core/server/services/members/MembersConfigProvider.js

@@ -1,6 +1,5 @@
 const logging = require('@tryghost/logging');
 const {URL} = require('url');
-const crypto = require('crypto');
 const createKeypair = require('keypair');
 
 class MembersConfigProvider {
@@ -42,20 +41,6 @@ class MembersConfigProvider {
         return this._settingsHelpers.isStripeConnected();
     }
 
-    getAuthSecret() {
-        const hexSecret = this._settingsCache.get('members_email_auth_secret');
-        if (!hexSecret) {
-            logging.warn('Could not find members_email_auth_secret, using dynamically generated secret');
-            return crypto.randomBytes(64);
-        }
-        const secret = Buffer.from(hexSecret, 'hex');
-        if (secret.length < 64) {
-            logging.warn('members_email_auth_secret not large enough (64 bytes), using dynamically generated secret');
-            return crypto.randomBytes(64);
-        }
-        return secret;
-    }
-
     getAllowSelfSignup() {
         // Free signups are allowed only if the site subscription is set to "Full-access"
         // It is blocked for "Invite-only", "Paid-members-only" and "None" accesses

package/core/server/services/members/SingleUseTokenProvider.js

@@ -193,7 +193,7 @@ class SingleUseTokenProvider {
         }
 
         try {
-            const model = await this.model.findOne({id: otcRef});
+            const model = await this.model.findOne({uuid: otcRef});
 
             if (!model) {
                 return false;
@@ -208,16 +208,16 @@ class SingleUseTokenProvider {
     }
 
     /**
-     * @method getIdByToken
-     * Retrieves the ID associated with a given token.
+     * @method getRefByToken
+     * Retrieves the ref associated with a given token.
      *
      * @param {string} token - The token to look up.
-     * @returns {Promise<string|null>} The ID if found, or null if not found or on error.
+     * @returns {Promise<string|null>} The ref if found, or null if not found or on error.
      */
-    async getIdByToken(token) {
+    async getRefByToken(token) {
         try {
             const model = await this.model.findOne({token});
-            return model ? model.get('id') : null;
+            return model ? model.get('uuid') : null;
         } catch (err) {
             return null;
         }
@@ -232,7 +232,7 @@ class SingleUseTokenProvider {
      */
     async getTokenByRef(ref) {
         try {
-            const model = await this.model.findOne({id: ref});
+            const model = await this.model.findOne({uuid: ref});
             return model ? model.get('token') : null;
         } catch (err) {
             return null;
@@ -300,7 +300,7 @@ class SingleUseTokenProvider {
                 return false;
             }
 
-            const tokenId = await this.getIdByToken(token);
+            const tokenId = await this.getRefByToken(token);
             if (!tokenId) {
                 return false;
             }