ghost 6.0.10 → 6.1.0

package/core/server/data/tinybird/tests/api_top_utm_terms.yaml

@@ -3,106 +3,113 @@
   description: All fixture data
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC
   expected_result: |
-    {"utm_term":"ghost cms","visits":6}
-    {"utm_term":"blog software","visits":3}
-    {"utm_term":"content management","visits":3}
-    {"utm_term":"newsletter platform","visits":3}
-    {"utm_term":"membership site","visits":1}
+    {"utm_term":"discount","visits":1}
+    {"utm_term":"ghost_blog","visits":1}
+    {"utm_term":"subscribers","visits":1}
+    {"utm_term":"loyal_customers","visits":1}
+    {"utm_term":"black_friday","visits":1}
+    {"utm_term":"new_feature","visits":1}
+    {"utm_term":"announcement","visits":1}
 
 - name: Filtered by browser - Chrome
   description: Filtered by browser - Chrome
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&browser=chrome
   expected_result: |
-    {"utm_term":"ghost cms","visits":4}
-    {"utm_term":"blog software","visits":1}
-    {"utm_term":"content management","visits":1}
-    {"utm_term":"newsletter platform","visits":1}
+    {"utm_term":"discount","visits":1}
+    {"utm_term":"ghost_blog","visits":1}
+    {"utm_term":"loyal_customers","visits":1}
 
 - name: Filtered by device - desktop
   description: Filtered by device - desktop
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&device=desktop
   expected_result: |
-    {"utm_term":"ghost cms","visits":6}
-    {"utm_term":"blog software","visits":3}
-    {"utm_term":"content management","visits":3}
-    {"utm_term":"newsletter platform","visits":2}
-    {"utm_term":"membership site","visits":1}
+    {"utm_term":"discount","visits":1}
+    {"utm_term":"ghost_blog","visits":1}
+    {"utm_term":"subscribers","visits":1}
+    {"utm_term":"loyal_customers","visits":1}
+    {"utm_term":"black_friday","visits":1}
+    {"utm_term":"new_feature","visits":1}
+    {"utm_term":"announcement","visits":1}
 
 - name: Filtered by location - UK
   description: Filtered by location - UK
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&location=GB
   expected_result: |
-    {"utm_term":"ghost cms","visits":3}
-    {"utm_term":"blog software","visits":2}
-    {"utm_term":"newsletter platform","visits":2}
-    {"utm_term":"content management","visits":1}
+    {"utm_term":"discount","visits":1}
+    {"utm_term":"ghost_blog","visits":1}
+    {"utm_term":"subscribers","visits":1}
+    {"utm_term":"new_feature","visits":1}
 
 - name: Filtered by OS - Windows
   description: Filtered by OS - Windows
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&os=windows
   expected_result: |
-    {"utm_term":"ghost cms","visits":5}
-    {"utm_term":"blog software","visits":3}
-    {"utm_term":"content management","visits":3}
-    {"utm_term":"newsletter platform","visits":2}
-    {"utm_term":"membership site","visits":1}
+    {"utm_term":"discount","visits":1}
+    {"utm_term":"ghost_blog","visits":1}
+    {"utm_term":"subscribers","visits":1}
+    {"utm_term":"loyal_customers","visits":1}
+    {"utm_term":"black_friday","visits":1}
+    {"utm_term":"new_feature","visits":1}
+    {"utm_term":"announcement","visits":1}
 
 - name: Filtered by pathname - /about/
   description: Filtered by pathname - /about/
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&pathname=%2Fabout%2F
   expected_result: |
-    {"utm_term":"ghost cms","visits":4}
-    {"utm_term":"content management","visits":2}
-    {"utm_term":"blog software","visits":1}
-    {"utm_term":"newsletter platform","visits":1}
+    {"utm_term":"discount","visits":1}
+    {"utm_term":"subscribers","visits":1}
+    {"utm_term":"loyal_customers","visits":1}
+    {"utm_term":"new_feature","visits":1}
+    {"utm_term":"announcement","visits":1}
 
 - name: Filtered by post_uuid - 06b1b0c9-fb53-4a15-a060-3db3fde7b1fc (/about/)
   description: Filtered by post_uuid - 06b1b0c9-fb53-4a15-a060-3db3fde7b1fc (/about/)
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&post_uuid=06b1b0c9-fb53-4a15-a060-3db3fde7b1fc
   expected_result: |
-    {"utm_term":"ghost cms","visits":4}
-    {"utm_term":"content management","visits":2}
-    {"utm_term":"blog software","visits":1}
-    {"utm_term":"newsletter platform","visits":1}
+    {"utm_term":"discount","visits":1}
+    {"utm_term":"subscribers","visits":1}
+    {"utm_term":"loyal_customers","visits":1}
+    {"utm_term":"new_feature","visits":1}
+    {"utm_term":"announcement","visits":1}
 
 - name: Filtered by source - bing.com
   description: Filtered by source - bing.com
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&source=bing.com
   expected_result: |
-    {"utm_term":"content management","visits":2}
+    {"utm_term":"subscribers","visits":1}
+    {"utm_term":"loyal_customers","visits":1}
 
 - name: Filtered by member status - paid
   description: Filtered by member status - paid
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&member_status=paid
   expected_result: |
-    {"utm_term":"blog software","visits":2}
-    {"utm_term":"ghost cms","visits":2}
-    {"utm_term":"content management","visits":1}
+    {"utm_term":"ghost_blog","visits":1}
+    {"utm_term":"loyal_customers","visits":1}
+    {"utm_term":"new_feature","visits":1}
 
 - name: Filtered by member status - undefined
   description: Filtered by member status - undefined
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&member_status=undefined
   expected_result: |
-    {"utm_term":"newsletter platform","visits":3}
-    {"utm_term":"blog software","visits":1}
-    {"utm_term":"membership site","visits":1}
-    {"utm_term":"ghost cms","visits":1}
+    {"utm_term":"discount","visits":1}
+    {"utm_term":"black_friday","visits":1}
+    {"utm_term":"announcement","visits":1}
 
 - name: Filtered by timezone - America/Los_Angeles
   description: Filtered by timezone - America/Los_Angeles
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=America/Los_Angeles
   expected_result: |
-    {"utm_term":"ghost cms","visits":5}
-    {"utm_term":"blog software","visits":3}
-    {"utm_term":"content management","visits":2}
-    {"utm_term":"newsletter platform","visits":2}
-    {"utm_term":"membership site","visits":1}
+    {"utm_term":"discount","visits":1}
+    {"utm_term":"ghost_blog","visits":1}
+    {"utm_term":"loyal_customers","visits":1}
+    {"utm_term":"black_friday","visits":1}
+    {"utm_term":"new_feature","visits":1}
+    {"utm_term":"announcement","visits":1}
 
 - name: Test with multiple filters combined
   description: Test with multiple filters combined
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&device=desktop&browser=firefox
   expected_result: |
-    {"utm_term":"blog software","visits":2}
-    {"utm_term":"membership site","visits":1}
-    {"utm_term":"content management","visits":1}
-    {"utm_term":"newsletter platform","visits":1}
+    {"utm_term":"black_friday","visits":1}
+    {"utm_term":"new_feature","visits":1}
+    {"utm_term":"announcement","visits":1}

package/core/server/models/single-use-token.js

@@ -7,6 +7,7 @@ const SingleUseToken = ghostBookshelf.Model.extend({
     defaults() {
         return {
             used_count: 0,
+            uuid: crypto.randomUUID(),
             token: crypto
                 .randomBytes(192 / 8)
                 .toString('base64')

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

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

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

@@ -9,6 +9,12 @@
     </head>
     <body>
         <span class="preheader">{{preheader}}</span>
+        {{#hasFeature 'emailCustomization'}}
+        <!-- SPACING TO AVOID BODY TEXT BEING DUPLICATED IN PREVIEW TEXT -->
+        <div style="display:none; max-height:0; overflow:hidden; mso-hide: all;" aria-hidden="true" role="presentation">
+            {{{preheaderSpacing}}}
+        </div>
+        {{/hasFeature}}
 
         <!-- HEADER WITH FULL-WIDTH BACKGROUND -->
         {{#if hasHeaderContent}}

package/core/server/services/members/emails/signin.js

@@ -126,8 +126,8 @@ module.exports = ({t, siteTitle, email, url, otc, accentColor = '#15212A', siteD
                       <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: 20px; color: #15212A; font-weight: bold; line-height: 24px; margin: 0; margin-bottom: 15px;">${t('Hey there,')}</p>
                         ${otc ?
-                        `<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; line-height: 24px; margin-bottom: 24px;">${t(`Welcome back! Here's your code to sign in to {siteTitle}. For your security, it's only valid for 24 hours`, {siteTitle, interpolation: {escapeValue: false}})}:</p>
-                        <table border="0" cellpadding="0" cellspacing="0" class="btn btn-primary" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box; margin-bottom: 32px;">
+                        `<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; line-height: 24px; margin-bottom: 24px;">${t(`Welcome back! Here's your code to sign in to {siteTitle}`, {siteTitle, interpolation: {escapeValue: false}})}:</p>
+                        <table border="0" cellpadding="0" cellspacing="0" class="btn btn-primary" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; min-width: 100%; width: 100%; box-sizing: border-box; margin-bottom: 32px;">
                           <tbody>
                             <tr>
                               <td style="padding: 16px; background-color: #F4F5F6; border-radius: 8px; text-align: center; vertical-align: middle;" valign="middle">
@@ -137,11 +137,11 @@ module.exports = ({t, siteTitle, email, url, otc, accentColor = '#15212A', siteD
                           </tbody>
                         </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; margin: 0; line-height: 24px; margin-bottom: 24px;">${t('Or, skip the code and sign in directly')}:</p>
-                        <table border="0" cellpadding="0" cellspacing="0" class="btn btn-primary" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; box-sizing: border-box;">
+                        <table border="0" cellpadding="0" cellspacing="0" class="btn btn-primary" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; min-width: 100%; box-sizing: border-box;">
                           <tbody>
                             <tr>
                               <td align="center" 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; vertical-align: top; padding-bottom: 35px;">
-                                <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;">
+                                <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%; min-width: 100%;">
                                   <tbody>
                                     <tr>
                                       <td align="center" 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; vertical-align: top; background-color: ${accentColor}; border-radius: 5px; text-align: center;"> <a href="${url}" target="_blank" style="display: inline-block; color: #ffffff; background-color: ${accentColor}; border: solid 1px ${accentColor}; border-radius: 5px; box-sizing: border-box; cursor: pointer; text-decoration: none; font-size: 16px; font-weight: normal; margin: 0; padding: 9px 22px 10px; border-color: ${accentColor};">${t('Sign in now')}</a> </td>

package/core/server/services/stats/MrrStatsService.js

@@ -34,18 +34,21 @@ class MrrStatsService {
 
     /**
      * Get the MRR deltas for all days (from old to new), grouped by currency (ascending alphabetically)
+     * @param {string} [dateFrom] - Start date to fetch deltas from
      * @returns {Promise<MrrDelta[]>} The deltas sorted from new to old
      */
-    async fetchAllDeltas() {
+    async fetchAllDeltas(dateFrom) {
         const knex = this.knex;
-        const ninetyDaysAgo = moment.utc().subtract(90, 'days').startOf('day').utc().format('YYYY-MM-DD HH:mm:ss');
+        const startDate = dateFrom
+            ? moment.utc(dateFrom).startOf('day').utc().format('YYYY-MM-DD HH:mm:ss')
+            : moment.utc().subtract(90, 'days').startOf('day').utc().format('YYYY-MM-DD HH:mm:ss');
         const rows = await knex('members_paid_subscription_events')
             .select('currency')
             // In SQLite, DATE(created_at) would map to a string value, while DATE(created_at) would map to a JSDate object in MySQL
             // That is why we need the cast here (to have some consistency)
             .select(knex.raw('CAST(DATE(created_at) as CHAR) as date'))
             .select(knex.raw(`SUM(mrr_delta) as delta`))
-            .where('created_at', '>=', ninetyDaysAgo)
+            .where('created_at', '>=', startDate)
             .groupByRaw('CAST(DATE(created_at) as CHAR), currency');
         return rows;
     }
@@ -53,13 +56,15 @@ class MrrStatsService {
     /**
      * Returns a list of the MRR history for each day and currency, including the current MRR per currency as meta data.
      * The respons is in ascending date order, and currencies for the same date are always in ascending order.
+     * @param {Object} [options]
+     * @param {string} [options.dateFrom] - Start date to fetch history from
      * @returns {Promise<MrrHistory>}
      */
-    async getHistory() {
+    async getHistory(options = {}) {
         // Fetch current total amounts and start counting from there
         const totals = await this.getCurrentMrr();
 
-        const rows = await this.fetchAllDeltas();
+        const rows = await this.fetchAllDeltas(options.dateFrom);
 
         rows.sort((rowA, rowB) => {
             const dateA = new Date(rowA.date);

package/core/server/services/stats/StatsService.js

@@ -23,8 +23,8 @@ class StatsService {
         this.content = deps.content;
     }
 
-    async getMRRHistory() {
-        return this.mrr.getHistory();
+    async getMRRHistory(options = {}) {
+        return this.mrr.getHistory(options);
     }
 
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ghost",
-  "version": "6.0.10",
+  "version": "6.1.0",
   "description": "The professional publishing platform",
   "author": "Ghost Foundation",
   "homepage": "https://ghost.org",
@@ -86,7 +86,7 @@
     "@tryghost/helpers": "1.1.97",
     "@tryghost/html-to-plaintext": "1.0.4",
     "@tryghost/http-cache-utils": "0.1.20",
-    "@tryghost/i18n": "file:components/tryghost-i18n-6.0.10.tgz",
+    "@tryghost/i18n": "file:components/tryghost-i18n-6.1.0.tgz",
     "@tryghost/image-transform": "1.4.6",
     "@tryghost/job-manager": "1.0.3",
     "@tryghost/kg-card-factory": "5.1.2",
@@ -196,7 +196,7 @@
     "moment": "2.24.0",
     "moment-timezone": "0.5.45",
     "multer": "2.0.2",
-    "mysql2": "3.15.0",
+    "mysql2": "3.15.1",
     "nconf": "0.13.0",
     "node-fetch": "2.7.0",
     "node-jose": "2.2.0",
@@ -225,7 +225,7 @@
   },
   "devDependencies": {
     "@actions/core": "1.11.1",
-    "@playwright/test": "1.55.0",
+    "@playwright/test": "1.55.1",
     "@prettier/sync": "0.6.1",
     "@tryghost/express-test": "0.15.0",
     "@tryghost/webhook-mock-receiver": "0.2.17",
@@ -264,7 +264,7 @@
     "supertest": "6.3.4",
     "tmp": "0.2.5",
     "toml": "3.0.0",
-    "tsx": "4.20.5",
+    "tsx": "4.20.6",
     "typescript": "5.8.3"
   },
   "resolutions": {
@@ -273,7 +273,7 @@
     "jackspeak": "2.3.6",
     "moment": "2.24.0",
     "moment-timezone": "0.5.45",
-    "@tryghost/i18n": "file:components/tryghost-i18n-6.0.10.tgz"
+    "@tryghost/i18n": "file:components/tryghost-i18n-6.1.0.tgz"
   },
   "nx": {
     "targets": {