ghost 6.18.2 → 6.19.0

package/core/frontend/services/theme-engine/i18n/i18n.js

@@ -3,7 +3,6 @@ const logging = require('@tryghost/logging');
 const fs = require('fs-extra');
 const path = require('path');
 const MessageFormat = require('intl-messageformat');
-const jp = require('jsonpath');
 const isString = require('lodash/isString');
 const isObject = require('lodash/isObject');
 const isEqual = require('lodash/isEqual');
@@ -128,29 +127,25 @@ class I18n {
     }
 
     /**
-     * Do the lookup within the JSON file using jsonpath
+     * Do the lookup within the translation strings
      *
      * @param {String} msgPath
      */
     _getCandidateString(msgPath) {
-        // Our default string mode is "dot" for dot-notation, e.g. $.something.like.this used in the backend
-        // Both jsonpath's dot-notation and bracket-notation start with '$' E.g.: $.store.book.title or $['store']['book']['title']
-        // While bracket-notation allows any Unicode characters in keys (i.e. for themes / fulltext mode) E.g. $['Read more']
-        // dot-notation allows only word characters in keys for backend messages (that is \w or [A-Za-z0-9_] in RegExp)
-        let jsonPath = `$.${msgPath}`;
         let fallback = null;
 
         if (this._stringMode === 'fulltext') {
-            jsonPath = jp.stringify(['$', msgPath]);
-            // In fulltext mode we can use the passed string as a fallback
             fallback = msgPath;
+        } else if (/[^\w.]/.test(msgPath)) {
+            // In dot mode, keys must only contain word characters and dots.
+            // Reject anything else to match previous behavior.
+            this._handleInvalidKeyError(msgPath, new errors.InternalServerError({message: 'Invalid dot-notation path'}));
         }
 
-        try {
-            return jp.value(this._strings, jsonPath) || fallback;
-        } catch (err) {
-            this._handleInvalidKeyError(msgPath, err);
-        }
+        // Use array form [msgPath] for fulltext mode to prevent lodash splitting on dots.
+        // Use string form for dot mode so lodash splits 'a.b.c' into nested lookup.
+        const lookupPath = this._stringMode === 'fulltext' ? [msgPath] : msgPath;
+        return get(this._strings, lookupPath) || fallback;
     }
 
     /**

package/core/server/api/endpoints/settings-public.js

@@ -1,4 +1,5 @@
 const settingsCache = require('../../../shared/settings-cache');
+const labs = require('../../../shared/labs');
 const urlUtils = require('../../../shared/url-utils');
 const ghostVersion = require('@tryghost/version');
 
@@ -17,7 +18,8 @@ const controller = {
             return Object.assign({},
                 settingsCache.getPublic(), {
                     url: urlUtils.urlFor('home', true),
-                    version: ghostVersion.safe
+                    version: ghostVersion.safe,
+                    labs: labs.getAll()
                 }
             );
         }

package/core/server/api/endpoints/utils/serializers/input/settings.js

@@ -80,7 +80,12 @@ const EDITABLE_SETTINGS = [
     'explore_ping',
     'explore_ping_growth',
     'indexnow_api_key',
-    'transistor'
+    'transistor',
+    'transistor_portal_enabled',
+    'transistor_portal_heading',
+    'transistor_portal_description',
+    'transistor_portal_button_text',
+    'transistor_portal_url_template'
 ];
 
 module.exports = {

package/core/server/data/migrations/versions/6.19/2026-02-10-12-00-00-add-transistor-portal-settings.js

@@ -0,0 +1,39 @@
+const {combineTransactionalMigrations, addSetting} = require('../../utils');
+
+module.exports = combineTransactionalMigrations(
+    addSetting({
+        key: 'transistor_portal_enabled',
+        value: 'true',
+        type: 'boolean',
+        group: 'transistor',
+        flags: 'PUBLIC'
+    }),
+    addSetting({
+        key: 'transistor_portal_heading',
+        value: 'Podcasts',
+        type: 'string',
+        group: 'transistor',
+        flags: 'PUBLIC'
+    }),
+    addSetting({
+        key: 'transistor_portal_description',
+        value: 'Access your private podcast feed',
+        type: 'string',
+        group: 'transistor',
+        flags: 'PUBLIC'
+    }),
+    addSetting({
+        key: 'transistor_portal_button_text',
+        value: 'View',
+        type: 'string',
+        group: 'transistor',
+        flags: 'PUBLIC'
+    }),
+    addSetting({
+        key: 'transistor_portal_url_template',
+        value: 'https://partner.transistor.fm/ghost/{memberUuid}',
+        type: 'string',
+        group: 'transistor',
+        flags: 'PUBLIC'
+    })
+);

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

@@ -486,6 +486,34 @@
                 "isIn": [["true", "false"]]
             },
             "type": "boolean"
+        },
+        "transistor_portal_enabled": {
+            "defaultValue": "true",
+            "validations": {
+                "isIn": [["true", "false"]]
+            },
+            "type": "boolean",
+            "flags": "PUBLIC"
+        },
+        "transistor_portal_heading": {
+            "defaultValue": "Podcasts",
+            "type": "string",
+            "flags": "PUBLIC"
+        },
+        "transistor_portal_description": {
+            "defaultValue": "Access your private podcast feed",
+            "type": "string",
+            "flags": "PUBLIC"
+        },
+        "transistor_portal_button_text": {
+            "defaultValue": "View",
+            "type": "string",
+            "flags": "PUBLIC"
+        },
+        "transistor_portal_url_template": {
+            "defaultValue": "https://partner.transistor.fm/ghost/{memberUuid}",
+            "type": "string",
+            "flags": "PUBLIC"
         }
     },
     "views": {

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

@@ -487,9 +487,9 @@ module.exports = {
         stripe_coupon_id: {type: 'string', maxlength: 255, nullable: true, unique: true},
         interval: {type: 'string', maxlength: 50, nullable: false, validations: {isIn: [['month', 'year']]}},
         currency: {type: 'string', maxlength: 50, nullable: true},
-        discount_type: {type: 'string', maxlength: 50, nullable: false, validations: {isIn: [['percent', 'amount', 'trial']]}},
+        discount_type: {type: 'string', maxlength: 50, nullable: false, validations: {isIn: [['percent', 'amount', 'trial', 'free_months']]}},
         discount_amount: {type: 'integer', nullable: false},
-        duration: {type: 'string', maxlength: 50, nullable: false, validations: {isIn: [['trial', 'once', 'repeating', 'forever']]}},
+        duration: {type: 'string', maxlength: 50, nullable: false, validations: {isIn: [['trial', 'free_months', 'once', 'repeating', 'forever']]}},
         duration_in_months: {type: 'integer', nullable: true},
         portal_title: {type: 'string', maxlength: 191, nullable: true},
         portal_description: {type: 'string', maxlength: 2000, nullable: true},

package/core/server/data/seeders/importers/offers-importer.js

@@ -38,9 +38,9 @@ class OffersImporter extends TableImporter {
         // stripe_coupon_id: {type: 'string', maxlength: 255, nullable: true, unique: true},
         // interval: {type: 'string', maxlength: 50, nullable: false, validations: {isIn: [['month', 'year']]}},
         // currency: {type: 'string', maxlength: 50, nullable: true},
-        // discount_type: {type: 'string', maxlength: 50, nullable: false, validations: {isIn: [['percent', 'amount', 'trial']]}},
+        // discount_type: {type: 'string', maxlength: 50, nullable: false, validations: {isIn: [['percent', 'amount', 'trial', 'free_months']]}},
         // discount_amount: {type: 'integer', nullable: false},
-        // duration: {type: 'string', maxlength: 50, nullable: false, validations: {isIn: [['trial', 'once', 'repeating', 'forever']]}},
+        // duration: {type: 'string', maxlength: 50, nullable: false, validations: {isIn: [['trial', 'free_months', 'once', 'repeating', 'forever']]}},
         // duration_in_months: {type: 'integer', nullable: true},
         // portal_title: {type: 'string', maxlength: 191, nullable: true},
         // portal_description: {type: 'string', maxlength: 2000, nullable: true},

package/core/server/data/tinybird/endpoints/api_top_pages_router.pipe

@@ -0,0 +1,28 @@
+# api_top_pages_router - Smart router that delegates to optimal top pages implementation
+#
+# ROUTING LOGIC:
+#   - If session-level or location filters are present (device, location, source, utm_*),
+#     use api_top_pages which joins with filtered_sessions to support these filters
+#   - Otherwise, use api_top_pages_v3 which uses the daily materialized view
+#     for 3-4x faster queries
+#
+# Query parameters cascade automatically to the underlying pipe.
+
+TOKEN "stats_page" READ
+TOKEN "axis" READ
+
+NODE router
+DESCRIPTION >
+    Routes to the appropriate implementation based on filter parameters.
+    Session-level filters (device, location, source, utm_*) require the original pipe.
+    Simple queries use the faster v3 materialized view.
+
+SQL >
+    %
+    {% if defined(device) or defined(location) or defined(source) or defined(utm_source) or defined(utm_medium) or defined(utm_campaign) or defined(utm_term) or defined(utm_content) %}
+        SELECT * FROM api_top_pages
+    {% else %}
+        SELECT * FROM api_top_pages_v3
+    {% end %}
+
+TYPE ENDPOINT

package/core/server/data/tinybird/endpoints/api_top_pages_v3.pipe

@@ -34,8 +34,10 @@ SQL >
     FROM _mv_daily_pages
     WHERE
         site_uuid = {{ String(site_uuid, 'mock_site_uuid', description="Tenant ID", required=True) }}
-        AND day >= toDate({{ Date(date_from, description="Start date for filtering", required=True) }}, {{ String(timezone, 'Etc/UTC', description="Site timezone", required=True) }})
-        AND day <= toDate({{ Date(date_to, description="End date for filtering", required=True) }}, {{ String(timezone, 'Etc/UTC', description="Site timezone", required=True) }})
+        {% if defined(date_from) %}
+        AND day >= toDate({{ Date(date_from, description="Start date for filtering", required=False) }}, {{ String(timezone, 'Etc/UTC', description="Site timezone", required=True) }})
+        {% end %}
+        AND day <= toDate({% if defined(date_to) %}{{ Date(date_to, description="End date for filtering", required=False) }}{% else %}now(){% end %}, {{ String(timezone, 'Etc/UTC', description="Site timezone", required=True) }})
         AND day != toDate(now(), {{ String(timezone, 'Etc/UTC', description="Site timezone", required=True) }})
         {% if defined(member_status) %}
             AND member_status IN (
@@ -70,8 +72,10 @@ SQL >
     WHERE
         site_uuid = {{ String(site_uuid, 'mock_site_uuid', description="Tenant ID", required=True) }}
         AND toDate(timestamp, {{ String(timezone, 'Etc/UTC', description="Site timezone", required=True) }}) = toDate(now(), {{ String(timezone, 'Etc/UTC', description="Site timezone", required=True) }})
-        AND timestamp >= toDateTime({{ Date(date_from, description="Start date for filtering", required=True) }}, {{ String(timezone, 'Etc/UTC', description="Site timezone", required=True) }})
-        AND timestamp < toDateTime({{ Date(date_to, description="End date for filtering", required=True) }}, {{ String(timezone, 'Etc/UTC', description="Site timezone", required=True) }}) + interval 1 day
+        {% if defined(date_from) %}
+        AND timestamp >= toDateTime({{ Date(date_from, description="Start date for filtering", required=False) }}, {{ String(timezone, 'Etc/UTC', description="Site timezone", required=True) }})
+        {% end %}
+        AND timestamp < toDateTime({% if defined(date_to) %}{{ Date(date_to, description="End date for filtering", required=False) }}{% else %}now(){% end %}, {{ String(timezone, 'Etc/UTC', description="Site timezone", required=True) }}) + interval 1 day
         {% if defined(member_status) %}
             AND member_status IN (
                 SELECT arrayJoin(

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

@@ -0,0 +1,74 @@
+
+- name: no_session_level_filters
+  description: Query without session-level filters (should route to optimized pipe)
+  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC
+  expected_result: |
+    {"post_uuid":"6b8635fb-292f-4422-9fe4-d76cfab2ba31","pathname":"\/blog\/hello-world\/","visits":9}
+    {"post_uuid":"06b1b0c9-fb53-4a15-a060-3db3fde7b1fc","pathname":"\/about\/","visits":8}
+    {"post_uuid":"","pathname":"\/","visits":7}
+    {"post_uuid":"06b1b0c9-fb53-4a15-a060-3db3fde7b1dd","pathname":"\/blog\/hello-world\/","visits":1}
+
+- name: pathname_filter
+  description: Query with pathname filter (should route to optimized pipe)
+  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&pathname=%2Fabout%2F
+  expected_result: |
+    {"post_uuid":"06b1b0c9-fb53-4a15-a060-3db3fde7b1fc","pathname":"\/about\/","visits":8}
+
+- name: post_uuid_filter
+  description: Query with post_uuid filter (should route to optimized pipe)
+  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&post_uuid=6b8635fb-292f-4422-9fe4-d76cfab2ba31
+  expected_result: |
+    {"post_uuid":"6b8635fb-292f-4422-9fe4-d76cfab2ba31","pathname":"\/blog\/hello-world\/","visits":9}
+
+- name: device_filter
+  description: Query with device filter routes to api_top_pages
+  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&device=desktop
+  expected_result: |
+    {"post_uuid":"06b1b0c9-fb53-4a15-a060-3db3fde7b1fc","pathname":"\/about\/","visits":8}
+    {"post_uuid":"6b8635fb-292f-4422-9fe4-d76cfab2ba31","pathname":"\/blog\/hello-world\/","visits":8}
+    {"post_uuid":"","pathname":"\/","visits":7}
+    {"post_uuid":"06b1b0c9-fb53-4a15-a060-3db3fde7b1dd","pathname":"\/blog\/hello-world\/","visits":1}
+
+- name: location_filter
+  description: Query with location filter routes to api_top_pages
+  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&location=GB
+  expected_result: |
+    {"post_uuid":"6b8635fb-292f-4422-9fe4-d76cfab2ba31","pathname":"\/blog\/hello-world\/","visits":6}
+    {"post_uuid":"06b1b0c9-fb53-4a15-a060-3db3fde7b1fc","pathname":"\/about\/","visits":4}
+    {"post_uuid":"","pathname":"\/","visits":4}
+
+- name: source_filter
+  description: Query with source filter routes to api_top_pages
+  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&source=bing.com
+  expected_result: |
+    {"post_uuid":"06b1b0c9-fb53-4a15-a060-3db3fde7b1fc","pathname":"\/about\/","visits":2}
+    {"post_uuid":"","pathname":"\/","visits":1}
+    {"post_uuid":"6b8635fb-292f-4422-9fe4-d76cfab2ba31","pathname":"\/blog\/hello-world\/","visits":1}
+
+- name: utm_source_filter
+  description: Query with utm_source filter routes to api_top_pages
+  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&utm_source=google
+  expected_result: |
+    {"post_uuid":"6b8635fb-292f-4422-9fe4-d76cfab2ba31","pathname":"\/blog\/hello-world\/","visits":2}
+    {"post_uuid":"06b1b0c9-fb53-4a15-a060-3db3fde7b1dd","pathname":"\/blog\/hello-world\/","visits":1}
+
+- name: date_from_only
+  description: Query with only date_from (no date_to) routes to v3 without error (fixture data is far into the future)
+  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&timezone=Etc/UTC
+  expected_result: ''
+
+- name: date_to_only
+  description: Query with only date_to (no date_from) routes to v3 and returns all
+    data up to date_to
+  parameters: site_uuid=mock_site_uuid&date_to=2100-01-07&timezone=Etc/UTC
+  expected_result: |
+    {"post_uuid":"6b8635fb-292f-4422-9fe4-d76cfab2ba31","pathname":"\/blog\/hello-world\/","visits":9}
+    {"post_uuid":"06b1b0c9-fb53-4a15-a060-3db3fde7b1fc","pathname":"\/about\/","visits":8}
+    {"post_uuid":"","pathname":"\/","visits":7}
+    {"post_uuid":"06b1b0c9-fb53-4a15-a060-3db3fde7b1dd","pathname":"\/blog\/hello-world\/","visits":1}
+
+- name: no_date_filters
+  description: Query with no date filters routes to v3 without error (date_to defaults
+    to now and fixture data is far into the future)
+  parameters: site_uuid=mock_site_uuid&timezone=Etc/UTC
+  expected_result: ''

package/core/server/services/comments/comments-service-emails.js

@@ -26,10 +26,7 @@ class CommentsServiceEmails {
      */
     getPostUrl(postId, commentId) {
         const baseUrl = this.urlService.getUrlByResourceId(postId, {absolute: true});
-        if (this.labs.isSet('commentPermalinks')) {
-            return `${baseUrl}#ghost-comments-${commentId}`;
-        }
-        return `${baseUrl}#ghost-comments-root`;
+        return `${baseUrl}#ghost-comments-${commentId}`;
     }
 
     async notifyPostAuthors(comment) {

package/core/server/services/email-service/email-templates/partials/styles.hbs

@@ -1788,6 +1788,49 @@ img.kg-cta-image {
     color: rgba(0, 0, 0, 0.6) !important;
     {{/if}}
 }
+
+.kg-transistor-card {
+    width: auto;
+    width: 100%;
+    margin: 0 auto 1.5em;
+    border-radius: 3px;
+    {{#if backgroundIsDark}}
+        background-color: #15212A;
+        background-color: rgba(0, 0, 0, 0.15);
+        border: 1px solid #343434;
+        border: 1px solid rgba(255, 255, 255, 0.25);
+    {{else}}
+        background-color: #ffffff;
+        background-color: rgba(255, 255, 255, 0.25);
+        border: 1px solid #e0e7eb;
+        border: 1px solid rgba(0, 0, 0, 0.12);
+    {{/if}}
+}
+.kg-transistor-title {
+    display: block;
+    padding-right: 20px;
+    padding-bottom: 4px;
+    padding-top: 4px;
+    font-size: 16px;
+    font-weight: 600;
+    line-height: 18px;
+    text-decoration: none !important;
+    color: {{#if backgroundIsDark}}#ffffff{{else}}#15212A{{/if}} !important;
+}
+.kg-transistor-description {
+    display: block;
+    font-size: 13px;
+    line-height: 1.35em;
+    text-decoration: none !important;
+    {{#if backgroundIsDark}}
+    color: #ffffff !important;
+    color: rgba(255, 255, 255, 0.6) !important;
+    {{else}}
+    color: #15212a !important;
+    color: rgba(0, 0, 0, 0.6) !important;
+    {{/if}}
+}
+
 .kg-file-card {
     width: auto;
     width: 100%;

package/core/server/services/koenig/node-renderers/transistor-renderer.js

@@ -43,8 +43,8 @@ function frontendTemplate(node, document, options) {
 }
 
 function emailTemplate(node, document, options) {
-    const accentColor = node.accentColor || '#15171A';
-    const transistorLogo = 'data:image/svg+xml,' + encodeURIComponent(`<svg viewBox="5 0.5 144 144" xmlns="http://www.w3.org/2000/svg"><g fill="${accentColor}"><path d="M77 120.3c-2.6 0-4.8-2.1-4.8-4.8V29.4c0-2.6 2.1-4.8 4.8-4.8s4.8 2.1 4.8 4.8v86.2c0 2.6-2.2 4.7-4.8 4.7z"/><path d="M57 77.3H34c-2.6 0-4.8-2.1-4.8-4.8 0-2.6 2.1-4.8 4.8-4.8h23c2.6 0 4.8 2.1 4.8 4.8 0 2.6-2.1 4.8-4.8 4.8z"/><path d="M120.1 77.3h-23c-2.6 0-4.8-2.1-4.8-4.8 0-2.6 2.1-4.8 4.8-4.8h23c2.6 0 4.8 2.1 4.8 4.8 0 2.6-2.2 4.8-4.8 4.8z"/><path d="M77 144.5c-39.7 0-72-32.3-72-72s32.3-72 72-72 72 32.3 72 72-32.3 72-72 72zM77 10c-34.4 0-62.4 28-62.4 62.4 0 34.4 28 62.4 62.4 62.4 34.4 0 62.4-28 62.4-62.4C139.4 38 111.4 10 77 10z"/></g></svg>`);
+    // Use the site accent color from the newsletter/email design settings
+    const accentColor = options.design?.accentColor || '#15171A';
 
     // Use {uuid} replacement string - wrapReplacementStrings converts this to %%{uuid}%%
     // which gets replaced with actual member UUID when email is sent to each recipient
@@ -53,21 +53,27 @@ function emailTemplate(node, document, options) {
     const cardHtml = html`
         <table class="kg-card kg-transistor-card" cellspacing="0" cellpadding="0" border="0" width="100%">
             <tr>
-                <td align="center" style="padding: 24px 0; text-align: center;">
-                    <a href="${transistorUrl}" style="text-decoration: none;">
-                        <img src="${transistorLogo}"
-                             width="56" height="56"
-                             alt="Transistor"
-                             style="border-radius: 8px; display: block; margin: 0 auto 12px auto;">
-                    </a>
-                    <a href="${transistorUrl}"
-                       style="font-weight: 600; text-decoration: none; color: ${accentColor}; font-size: 16px; display: block;">
-                        Listen on Transistor
-                    </a>
-                    <a href="${transistorUrl}"
-                       style="color: #738a94; font-size: 14px; text-decoration: none; display: block; margin-top: 4px;">
-                        Get your private podcast feed
-                    </a>
+                <td style="padding: 4px;">
+                    <table cellspacing="0" cellpadding="0" border="0" width="100%">
+                        <tr>
+                            <td valign="middle" width="56" style="padding-right: 14px;">
+                                <a href="${transistorUrl}" style="display: block; width: 52px; height: 52px; padding-top: 4px; padding-right: 4px; padding-bottom: 4px; padding-left: 4px; border-radius: 2px; background-color: ${accentColor}">
+                                    <img src="https://static.ghost.org/v6.0.0/images/transistor-logo-ondark.png"
+                                        width="36" height="36"
+                                        alt="Transistor"
+                                        style="width: 36px; height: 36px; padding: 8px;">
+                                </a>
+                            </td>
+                            <td valign="middle" style="vertical-align: middle;">
+                                <a href="${transistorUrl}" class="kg-transistor-title">
+                                    Listen to your podcasts
+                                </a>
+                                <a href="${transistorUrl}"  class="kg-transistor-description">
+                                    Get your personal podcast feed to subscribe and listen in your favorite podcast app.
+                                </a>
+                            </td>
+                        </tr>
+                    </table>
                 </td>
             </tr>
         </table>

package/core/server/services/members/members-api/repositories/member-repository.js

@@ -8,6 +8,7 @@ const ObjectId = require('bson-objectid').default;
 const {NotFoundError} = require('@tryghost/errors');
 const validator = require('@tryghost/validator');
 const crypto = require('crypto');
+const addCalendarMonths = require('../utils/add-calendar-months');
 const StartOutboxProcessingEvent = require('../../../outbox/events/start-outbox-processing-event');
 const {MEMBER_WELCOME_EMAIL_SLUGS} = require('../../../member-welcome-emails/constants');
 const messages = {
@@ -1800,23 +1801,46 @@ module.exports = class MemberRepository {
             });
         }
 
-        // Validate coupon was provided (getCouponForOffer returns null for trial offers or if offer has no stripe_coupon_id)
+        const stripeSubscriptionId = subscriptionModel.get('subscription_id');
+        const isFreeMonthsOffer = offer.type === 'free_months';
+
+        if (isFreeMonthsOffer) {
+            const currentPeriodEnd = subscriptionModel.get('current_period_end');
+            if (!currentPeriodEnd) {
+                throw new errors.BadRequestError({
+                    message: tpl(messages.subscriptionNotActive)
+                });
+            }
+
+            const trialEndDate = addCalendarMonths(currentPeriodEnd, offer.amount);
+            const trialEnd = Math.floor(trialEndDate.getTime() / 1000);
+
+            const updatedSubscription = await this._stripeAPIService.updateSubscriptionTrialEnd(
+                stripeSubscriptionId,
+                trialEnd,
+                {prorationBehavior: 'none'}
+            );
+
+            return this.linkSubscription({
+                id: member.id,
+                subscription: updatedSubscription,
+                offerId: data.offerId
+            }, options);
+        }
+
+        // Besides free_months and trial offers, all other offers rely on a Stripe Coupon
         if (!data.couponId) {
             throw new errors.BadRequestError({
                 message: tpl(messages.offerNoCoupon)
             });
         }
 
-        const stripeSubscriptionId = subscriptionModel.get('subscription_id');
-
-        // Apply coupon to Stripe subscription
         const updatedSubscription = await this._stripeAPIService.addCouponToSubscription(
             stripeSubscriptionId,
             data.couponId
         );
 
-        // Sync local state with Stripe
-        await this.linkSubscription({
+        return this.linkSubscription({
             id: member.id,
             subscription: updatedSubscription,
             offerId: data.offerId

package/core/server/services/members/members-api/services/next-payment-calculator.js

@@ -7,8 +7,8 @@
  * @prop {string} offer_id
  * @prop {string} start
  * @prop {string|null} end
- * @prop {'once'|'repeating'|'forever'} duration
- * @prop {'percent'|'fixed'} type
+ * @prop {'once'|'repeating'|'forever'|'free_months'} duration
+ * @prop {'percent'|'fixed'|'free_months'} type
  * @prop {number} amount
  */
 
@@ -47,36 +47,29 @@ class NextPaymentCalculator {
         const interval = subscription.plan.interval;
         const currency = subscription.plan.currency;
         const offer = subscription.offer || null;
+        const defaultNextPayment = {
+            original_amount: originalAmount,
+            amount: originalAmount,
+            interval,
+            currency,
+            discount: null
+        };
 
         if (!offer || offer.type === 'trial') {
-            return {
-                original_amount: originalAmount,
-                amount: originalAmount,
-                interval,
-                currency,
-                discount: null
-            };
+            return defaultNextPayment;
         }
 
         const activeDiscount = this._getActiveDiscount(subscription, offer);
 
         if (!activeDiscount) {
-            return {
-                original_amount: originalAmount,
-                amount: originalAmount,
-                interval,
-                currency,
-                discount: null
-            };
+            return defaultNextPayment;
         }
 
         const discountedAmount = this._calculateDiscountedAmount(originalAmount, offer);
 
         return {
-            original_amount: originalAmount,
+            ...defaultNextPayment,
             amount: discountedAmount,
-            interval,
-            currency,
             discount: {
                 offer_id: offer.id,
                 start: activeDiscount.start ? new Date(activeDiscount.start).toISOString() : null,
@@ -106,6 +99,21 @@ class NextPaymentCalculator {
      * @returns {ActiveDiscount|null}
      */
     _getActiveDiscount(subscription, offer) {
+        // Free months are based on trial periods in Stripe: they're active if the trial period is still ongoing
+        if (offer.type === 'free_months') {
+            const end = new Date(subscription.trial_end_at);
+
+            if (new Date() >= end) {
+                return null;
+            }
+
+            return {
+                start: subscription.trial_start_at,
+                end
+            };
+        }
+
+        // Other offers are based on a Stripe coupon, with a discount_start / discount_end
         if (subscription.discount_start) {
             return {
                 start: subscription.discount_start,
@@ -113,7 +121,7 @@ class NextPaymentCalculator {
             };
         }
 
-        // Backportability for signup offers without discount_start / discount_end
+        // Backportability for old signup offers without discount_start / discount_end
         if (offer.redemption_type !== 'signup') {
             return null;
         }

package/core/server/services/members/members-api/services/payments-service.js

@@ -482,7 +482,7 @@ class PaymentsService {
      */
     async getCouponForOffer(offerId) {
         const row = await this.OfferModel.where({id: offerId}).query().select('stripe_coupon_id', 'discount_type').first();
-        if (!row || row.discount_type === 'trial') {
+        if (!row || row.discount_type === 'trial' || row.discount_type === 'free_months') {
             return null;
         }
         if (!row.stripe_coupon_id) {

package/core/server/services/members/members-api/utils/add-calendar-months.js

@@ -0,0 +1,49 @@
+const errors = require('@tryghost/errors');
+
+/**
+ * Add calendar months in UTC while preserving month-end behavior.
+ * Example: Jan 31 + 1 month => Feb 28/29 (not Mar 2/3).
+ *
+ * @param {Date|string|number} inputDate
+ * @param {number} months
+ * @returns {Date}
+ */
+module.exports = function addCalendarMonths(inputDate, months) {
+    const sourceDate = new Date(inputDate);
+    const normalizedMonths = Number(months);
+
+    if (Number.isNaN(sourceDate.getTime())) {
+        throw new errors.BadRequestError({
+            message: 'inputDate must be a valid date'
+        });
+    }
+
+    if (!Number.isInteger(normalizedMonths) || normalizedMonths < 1) {
+        throw new errors.BadRequestError({
+            message: 'months must be a positive integer'
+        });
+    }
+
+    const target = new Date(Date.UTC(
+        sourceDate.getUTCFullYear(),
+        sourceDate.getUTCMonth(),
+        1,
+        sourceDate.getUTCHours(),
+        sourceDate.getUTCMinutes(),
+        sourceDate.getUTCSeconds(),
+        sourceDate.getUTCMilliseconds()
+    ));
+
+    target.setUTCMonth(target.getUTCMonth() + normalizedMonths);
+
+    const originalDay = sourceDate.getUTCDate();
+    const daysInTargetMonth = new Date(Date.UTC(
+        target.getUTCFullYear(),
+        target.getUTCMonth() + 1,
+        0
+    )).getUTCDate();
+
+    target.setUTCDate(Math.min(originalDay, daysInTargetMonth));
+
+    return target;
+};