ghost 6.53.0 → 6.54.0

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

@@ -6,6 +6,11 @@
  * @typedef {object} LimitService
  * @typedef {{checkVerificationRequired(): Promise<boolean>}} VerificationTrigger
  * @typedef {import ('./domain-warming-service').DomainWarmingService} DomainWarmingService
+ *
+ * @typedef {object} EmailPreflight - Validation result from a pre-save checkCanSendEmail call
+ * @property {object} newsletter
+ * @property {string} emailRecipientFilter
+ * @property {number} emailCount
  */
 
 const BatchSendingService = require('./batch-sending-service');
@@ -122,9 +127,11 @@ class EmailService {
      *
      * @param {object} newsletter - The newsletter model to send to
      * @param {string} emailRecipientFilter - The recipient filter for the email
+     * @param {object} [options]
+     * @param {number} [options.emailCount] - A previously counted audience to revalidate without recounting
      * @returns {Promise<{emailCount: number}>} The email count if checks pass, throws if email cannot be sent
      */
-    async checkCanSendEmail(newsletter, emailRecipientFilter) {
+    async checkCanSendEmail(newsletter, emailRecipientFilter, {emailCount: knownEmailCount} = {}) {
         if (!newsletter) {
             throw new errors.EmailError({
                 message: tpl(messages.missingNewsletterError)
@@ -139,7 +146,9 @@ class EmailService {
             });
         }
 
-        const emailCount = await this.#emailSegmenter.getMembersCount(newsletter, emailRecipientFilter);
+        const emailCount = knownEmailCount === undefined
+            ? await this.#emailSegmenter.getMembersCount(newsletter, emailRecipientFilter)
+            : knownEmailCount;
         await this.checkLimits(emailCount);
 
         return {emailCount};
@@ -148,13 +157,20 @@ class EmailService {
     /**
      *
      * @param {Post} post
+     * @param {object} [options]
+     * @param {EmailPreflight} [options.preflight] - The emailCount is reused if the newsletter and filter still match the saved post
      * @returns {Promise<Email>}
      */
-    async createEmail(post) {
+    async createEmail(post, {preflight} = {}) {
         const newsletter = await post.getLazyRelation('newsletter');
         const emailRecipientFilter = post.get('email_recipient_filter');
 
-        const {emailCount} = await this.checkCanSendEmail(newsletter, emailRecipientFilter);
+        const preflightMatches = preflight?.newsletter?.id
+            && preflight.newsletter.id === newsletter?.id
+            && preflight.emailRecipientFilter === emailRecipientFilter;
+        const {emailCount} = preflightMatches
+            ? await this.checkCanSendEmail(newsletter, emailRecipientFilter, {emailCount: preflight.emailCount})
+            : await this.checkCanSendEmail(newsletter, emailRecipientFilter);
 
         const csdEmailCount = this.#domainWarmingService.isEnabled()
             ? await this.#domainWarmingService.getWarmupLimit(emailCount)

package/core/server/services/explore-ping/explore-ping-service.js

@@ -1,23 +1,17 @@
-module.exports = class ExplorePingService {
-    /**
-     * @param {object} deps
-     * @param {{get: (string) => string}} deps.settingsCache
-     * @param {object} deps.config
-     * @param {object} deps.labs
-     * @param {object} deps.logging
-     * @param {object} deps.ghostVersion
-     * @param {object} deps.request
-     * @param {{stats: {
-     *   getMostRecentlyPublishedPostDate: () => Promise<Date>,
-     *   getFirstPublishedPostDate: () => Promise<Date>,
-     *   getTotalPostsPublished: () => Promise<number>
-     * }}} deps.posts
-     * @param {{stats: {
-     *   getTotalMembers: () => Promise<number>
-     * }}} deps.members
-     * @param {{api: {mrr: {getCurrentMrr: () => Promise<{currency: string, mrr: number}[]>}}}} deps.statsService
-     */
-    constructor({settingsCache, config, labs, logging, ghostVersion, request, posts, members, statsService}) {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ExplorePingService = void 0;
+class ExplorePingService {
+    settingsCache;
+    config;
+    labs;
+    logging;
+    ghostVersion;
+    request;
+    posts;
+    members;
+    statsService;
+    constructor({ settingsCache, config, labs, logging, ghostVersion, request, posts, members, statsService }) {
         this.settingsCache = settingsCache;
         this.config = config;
         this.labs = labs;
@@ -28,7 +22,6 @@ module.exports = class ExplorePingService {
         this.members = members;
         this.statsService = statsService;
     }
-
     async constructPayload() {
         const payload = {
             ghost: this.ghostVersion.full,
@@ -38,18 +31,17 @@ module.exports = class ExplorePingService {
             facebook: this.settingsCache.get('facebook'),
             twitter: this.settingsCache.get('twitter')
         };
-
         try {
             const [totalPosts, lastPublishedAt, firstPublishedAt] = await Promise.all([
                 this.posts.stats.getTotalPostsPublished(),
                 this.posts.stats.getMostRecentlyPublishedPostDate(),
                 this.posts.stats.getFirstPublishedPostDate()
             ]);
-
             payload.posts_total = totalPosts;
             payload.posts_last = lastPublishedAt ? lastPublishedAt.toISOString() : null;
             payload.posts_first = firstPublishedAt ? firstPublishedAt.toISOString() : null;
-        } catch (err) {
+        }
+        catch (err) {
             this.logging.warn('Failed to fetch post statistics', {
                 error: err.message,
                 context: 'explore-ping-service'
@@ -58,12 +50,10 @@ module.exports = class ExplorePingService {
             payload.posts_last = null;
             payload.posts_first = null;
         }
-
         if (this.settingsCache.get('explore_ping_growth')) {
             try {
                 const totalMembers = await this.members.stats.getTotalMembers();
                 payload.members_total = totalMembers;
-
                 // Only send real MRR data when Stripe is in live mode
                 // When using test keys (stripe_connect_livemode is false/null), send empty array
                 const isStripeLiveMode = this.settingsCache.get('stripe_connect_livemode') === true;
@@ -71,10 +61,12 @@ module.exports = class ExplorePingService {
                     const mrrByCurrency = await this.statsService.api.mrr.getCurrentMrr();
                     // Return array of {currency, mrr} objects
                     payload.mrr = mrrByCurrency;
-                } else {
+                }
+                else {
                     payload.mrr = [];
                 }
-            } catch (err) {
+            }
+            catch (err) {
                 this.logging.warn('Failed to fetch member statistics', {
                     error: err.message,
                     context: 'explore-ping-service'
@@ -83,14 +75,11 @@ module.exports = class ExplorePingService {
                 payload.mrr = null;
             }
         }
-
         return payload;
     }
-
     async makeRequest(exploreUrl, payload) {
         const json = JSON.stringify(payload);
         this.logging.info('Pinging Explore with Payload', exploreUrl, json);
-
         try {
             const response = await this.request(exploreUrl, {
                 method: 'POST',
@@ -99,32 +88,28 @@ module.exports = class ExplorePingService {
                     'Content-Type': 'application/json'
                 }
             });
-
             this.logging.info('Explore Response', response.statusCode, response.statusMessage);
-
             return response;
-        } catch (err) {
+        }
+        catch (err) {
             this.logging.warn('Explore Error', err.message);
         }
     }
-
     async ping() {
         if (!this.labs.isSet('explore')) {
             return;
         }
-
         const exploreUrl = this.config.get('explore:update_url');
         if (!exploreUrl) {
             this.logging.warn('Explore URL not set');
             return;
         }
-
         if (!this.settingsCache.get('explore_ping')) {
             this.logging.info('Explore ping disabled');
             return;
         }
-
         const payload = await this.constructPayload();
         await this.makeRequest(exploreUrl, payload);
     }
-};
+}
+exports.ExplorePingService = ExplorePingService;

package/core/server/services/explore-ping/explore-ping-service.ts

@@ -0,0 +1,198 @@
+type SettingsCache = {
+    get(key: string): unknown;
+};
+
+type Config = {
+    get(key: string): unknown;
+};
+
+type Labs = {
+    isSet(flag: string): boolean;
+};
+
+type Logging = {
+    info(...args: unknown[]): void;
+    warn(...args: unknown[]): void;
+};
+
+type GhostVersion = {
+    full: string;
+};
+
+type RequestFn = (url: string, options: Record<string, unknown>) => Promise<{statusCode: number; statusMessage?: string}>;
+
+type PostsService = {
+    stats: {
+        getMostRecentlyPublishedPostDate(): Promise<Date | null>;
+        getFirstPublishedPostDate(): Promise<Date | null>;
+        getTotalPostsPublished(): Promise<number | null>;
+    };
+};
+
+type MembersService = {
+    stats: {
+        getTotalMembers(): Promise<number>;
+    };
+};
+
+type MrrByCurrency = {
+    currency: string;
+    mrr: number;
+};
+
+type StatsService = {
+    api?: {
+        mrr?: {
+            getCurrentMrr(): Promise<MrrByCurrency[]>;
+        };
+    };
+} | null;
+
+type ExplorePayload = {
+    ghost: string;
+    site_uuid: unknown;
+    url: unknown;
+    theme: unknown;
+    facebook: unknown;
+    twitter: unknown;
+    posts_total?: number | null;
+    posts_last?: string | null;
+    posts_first?: string | null;
+    members_total?: number | null;
+    mrr?: MrrByCurrency[] | null;
+};
+
+export type ExplorePingServiceDeps = {
+    settingsCache: SettingsCache;
+    config: Config;
+    labs: Labs;
+    logging: Logging;
+    ghostVersion: GhostVersion;
+    request: RequestFn;
+    posts: PostsService;
+    members: MembersService;
+    statsService: StatsService;
+};
+
+export class ExplorePingService {
+    settingsCache: SettingsCache;
+    config: Config;
+    labs: Labs;
+    logging: Logging;
+    ghostVersion: GhostVersion;
+    request: RequestFn;
+    posts: PostsService;
+    members: MembersService;
+    statsService: StatsService;
+
+    constructor({settingsCache, config, labs, logging, ghostVersion, request, posts, members, statsService}: ExplorePingServiceDeps) {
+        this.settingsCache = settingsCache;
+        this.config = config;
+        this.labs = labs;
+        this.logging = logging;
+        this.ghostVersion = ghostVersion;
+        this.request = request;
+        this.posts = posts;
+        this.members = members;
+        this.statsService = statsService;
+    }
+
+    async constructPayload(): Promise<ExplorePayload> {
+        const payload: ExplorePayload = {
+            ghost: this.ghostVersion.full,
+            site_uuid: this.settingsCache.get('site_uuid'),
+            url: this.config.get('url'),
+            theme: this.settingsCache.get('active_theme'),
+            facebook: this.settingsCache.get('facebook'),
+            twitter: this.settingsCache.get('twitter')
+        };
+
+        try {
+            const [totalPosts, lastPublishedAt, firstPublishedAt] = await Promise.all([
+                this.posts.stats.getTotalPostsPublished(),
+                this.posts.stats.getMostRecentlyPublishedPostDate(),
+                this.posts.stats.getFirstPublishedPostDate()
+            ]);
+
+            payload.posts_total = totalPosts;
+            payload.posts_last = lastPublishedAt ? lastPublishedAt.toISOString() : null;
+            payload.posts_first = firstPublishedAt ? firstPublishedAt.toISOString() : null;
+        } catch (err) {
+            this.logging.warn('Failed to fetch post statistics', {
+                error: (err as Error).message,
+                context: 'explore-ping-service'
+            });
+            payload.posts_total = null;
+            payload.posts_last = null;
+            payload.posts_first = null;
+        }
+
+        if (this.settingsCache.get('explore_ping_growth')) {
+            try {
+                const totalMembers = await this.members.stats.getTotalMembers();
+                payload.members_total = totalMembers;
+
+                // Only send real MRR data when Stripe is in live mode
+                // When using test keys (stripe_connect_livemode is false/null), send empty array
+                const isStripeLiveMode = this.settingsCache.get('stripe_connect_livemode') === true;
+                if (isStripeLiveMode && this.statsService?.api?.mrr) {
+                    const mrrByCurrency = await this.statsService.api.mrr.getCurrentMrr();
+                    // Return array of {currency, mrr} objects
+                    payload.mrr = mrrByCurrency;
+                } else {
+                    payload.mrr = [];
+                }
+            } catch (err) {
+                this.logging.warn('Failed to fetch member statistics', {
+                    error: (err as Error).message,
+                    context: 'explore-ping-service'
+                });
+                payload.members_total = null;
+                payload.mrr = null;
+            }
+        }
+
+        return payload;
+    }
+
+    async makeRequest(exploreUrl: string, payload: ExplorePayload | Record<string, unknown>): Promise<{statusCode: number; statusMessage?: string} | undefined> {
+        const json = JSON.stringify(payload);
+        this.logging.info('Pinging Explore with Payload', exploreUrl, json);
+
+        try {
+            const response = await this.request(exploreUrl, {
+                method: 'POST',
+                body: json,
+                headers: {
+                    'Content-Type': 'application/json'
+                }
+            });
+
+            this.logging.info('Explore Response', response.statusCode, response.statusMessage);
+
+            return response;
+        } catch (err) {
+            this.logging.warn('Explore Error', (err as Error).message);
+        }
+    }
+
+    async ping(): Promise<void> {
+        if (!this.labs.isSet('explore')) {
+            return;
+        }
+
+        const exploreUrl = this.config.get('explore:update_url') as string | undefined;
+        if (!exploreUrl) {
+            this.logging.warn('Explore URL not set');
+            return;
+        }
+
+        if (!this.settingsCache.get('explore_ping')) {
+            this.logging.info('Explore ping disabled');
+            return;
+        }
+
+        const payload = await this.constructPayload();
+        await this.makeRequest(exploreUrl, payload);
+    }
+}

package/core/server/services/explore-ping/index.js

@@ -1,4 +1,8 @@
-const ExplorePingService = require('./explore-ping-service');
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createService = createService;
+exports.init = init;
+const explore_ping_service_1 = require("./explore-ping-service");
 const config = require('../../../shared/config');
 const labs = require('../../../shared/labs');
 const logging = require('@tryghost/logging');
@@ -8,10 +12,9 @@ const settingsCache = require('../../../shared/settings-cache');
 const posts = require('../posts/posts-service-instance');
 const members = require('../members');
 const statsService = require('../stats');
-
 // Export the creation function for testing
-module.exports.createService = function createService() {
-    return new ExplorePingService({
+function createService() {
+    return new explore_ping_service_1.ExplorePingService({
         settingsCache,
         config,
         labs,
@@ -22,20 +25,17 @@ module.exports.createService = function createService() {
         members,
         statsService
     });
-};
-
-module.exports.init = async function init() {
+}
+async function init() {
     // The explore ping is a background "phone home" request. It should not run
     // in the test environment (cf. the update-check service, which gates on the
     // same environments), where there is no explore URL configured.
     if (!config.isProductionOrDevelopment()) {
         return;
     }
-
-    const explorePingService = module.exports.createService();
-
+    const explorePingService = createService();
     // The final intention is to have this run on a schedule
     // For the initial version, we'll just ping when the server starts
     // Without waiting for the response
     explorePingService.ping();
-};
+}

package/core/server/services/explore-ping/index.ts

@@ -0,0 +1,42 @@
+import {ExplorePingService} from './explore-ping-service';
+
+const config = require('../../../shared/config');
+const labs = require('../../../shared/labs');
+const logging = require('@tryghost/logging');
+const ghostVersion = require('@tryghost/version');
+const request = require('@tryghost/request');
+const settingsCache = require('../../../shared/settings-cache');
+const posts = require('../posts/posts-service-instance');
+const members = require('../members');
+const statsService = require('../stats');
+
+// Export the creation function for testing
+export function createService(): ExplorePingService {
+    return new ExplorePingService({
+        settingsCache,
+        config,
+        labs,
+        logging,
+        ghostVersion,
+        request,
+        posts: posts(),
+        members,
+        statsService
+    });
+}
+
+export async function init(): Promise<void> {
+    // The explore ping is a background "phone home" request. It should not run
+    // in the test environment (cf. the update-check service, which gates on the
+    // same environments), where there is no explore URL configured.
+    if (!config.isProductionOrDevelopment()) {
+        return;
+    }
+
+    const explorePingService = createService();
+
+    // The final intention is to have this run on a schedule
+    // For the initial version, we'll just ping when the server starts
+    // Without waiting for the response
+    explorePingService.ping();
+}

package/core/server/services/gifts/gift-reminder-scheduler.js

@@ -7,7 +7,7 @@ exports.GiftReminderScheduler = void 0;
 const logging_1 = __importDefault(require("@tryghost/logging"));
 const constants_1 = require("./constants");
 // Same-domain (scheduling) primitives, used unconditionally.
-const urlUtils = require('../../../shared/url-utils');
+const urlUtils = require('../../../shared/url-utils').default;
 const { getSignedAdminToken } = require('../../adapters/scheduling/utils');
 const MS_PER_DAY = 24 * 60 * 60 * 1000;
 const GIFT_REMINDER_LEAD_MS = constants_1.GIFT_REMINDER_LEAD_DAYS * MS_PER_DAY;

package/core/server/services/gifts/gift-reminder-scheduler.ts

@@ -4,7 +4,7 @@ import type {SchedulerAdapter, SchedulerJob} from '@tryghost/adapter-base-schedu
 import type {InternalApiKey, InternalKeys} from '../internal-keys';
 import {GIFT_REMINDER_LEAD_DAYS} from './constants';
 // Same-domain (scheduling) primitives, used unconditionally.
-const urlUtils = require('../../../shared/url-utils');
+const urlUtils = require('../../../shared/url-utils').default;
 const {getSignedAdminToken} = require('../../adapters/scheduling/utils');
 
 const MS_PER_DAY = 24 * 60 * 60 * 1000;

package/core/server/services/gifts/gift-service-wrapper.js

@@ -41,7 +41,7 @@ class GiftServiceWrapper {
 
         const {GhostMailer} = require('../mail');
         const settingsCache = require('../../../shared/settings-cache');
-        const urlUtils = require('../../../shared/url-utils');
+        const urlUtils = require('../../../shared/url-utils').default;
         const settingsHelpers = require('../settings-helpers');
         const EmailAddressParser = require('../email-address/email-address-parser');
         const {blogIcon} = require('../../../server/lib/image');

package/core/server/services/identity-tokens/identity-token-service-wrapper.js

@@ -9,7 +9,7 @@ module.exports = class IdentityTokenServiceWrapper {
             return;
         }
 
-        const urlUtils = require('../../../shared/url-utils');
+        const urlUtils = require('../../../shared/url-utils').default;
         const issuer = urlUtils.urlFor('admin', true);
 
         const settings = require('../../../shared/settings-cache');

package/core/server/services/indexnow-ping/constants.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.seoFields = exports.defaultPostSlugs = exports.INDEXNOW_ENDPOINT = exports.INDEXNOW_LOG_KEY = exports.messages = void 0;
+exports.messages = {
+    requestFailedError: 'The {service} service was unable to send a ping request, your site will continue to function.',
+    requestFailedHelp: 'If you get this error repeatedly, please seek help on {url}.'
+};
+exports.INDEXNOW_LOG_KEY = '[indexnow]';
+// IndexNow endpoint - this routes to all participating search engines
+exports.INDEXNOW_ENDPOINT = 'https://api.indexnow.org/indexnow';
+exports.defaultPostSlugs = [
+    'welcome',
+    'the-editor',
+    'using-tags',
+    'managing-users',
+    'private-sites',
+    'advanced-markdown',
+    'themes',
+    'coming-soon'
+];
+// Fields that affect how the post appears in search engine results
+exports.seoFields = [
+    'html', // Post content
+    'title', // Post title (appears in SERP)
+    'slug', // URL path
+    'meta_title', // Custom meta title
+    'meta_description', // Meta description (appears in SERP)
+    'canonical_url', // Canonical URL
+    'status' // Published status change
+];

package/core/server/services/indexnow-ping/constants.ts

@@ -0,0 +1,32 @@
+export const messages = {
+    requestFailedError: 'The {service} service was unable to send a ping request, your site will continue to function.',
+    requestFailedHelp: 'If you get this error repeatedly, please seek help on {url}.'
+};
+
+export const INDEXNOW_LOG_KEY = '[indexnow]';
+
+// IndexNow endpoint - this routes to all participating search engines
+export const INDEXNOW_ENDPOINT = 'https://api.indexnow.org/indexnow';
+
+export const defaultPostSlugs = [
+    'welcome',
+    'the-editor',
+    'using-tags',
+    'managing-users',
+    'private-sites',
+    'advanced-markdown',
+    'themes',
+    'coming-soon'
+];
+
+// Fields that affect how the post appears in search engine results
+export const seoFields = [
+    'html', // Post content
+    'title', // Post title (appears in SERP)
+    'slug', // URL path
+    'meta_title', // Custom meta title
+    'meta_description', // Meta description (appears in SERP)
+    'canonical_url', // Canonical URL
+    'status' // Published status change
+];
+