ghost 5.121.0 → 5.123.0

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

@@ -1,5 +1,6 @@
 const logging = require('@tryghost/logging');
 const errors = require('@tryghost/errors');
+const urlUtils = require('../../../shared/url-utils');
 
 /**
  * @typedef {Object} StatsServiceOptions
@@ -49,9 +50,11 @@ class PostsStatsService {
     /**
      * @param {object} deps
      * @param {import('knex').Knex} deps.knex - Database client
+     * @param {object} [deps.tinybirdClient] - Tinybird client for analytics
      */
     constructor(deps) {
         this.knex = deps.knex;
+        this.tinybirdClient = deps.tinybirdClient;
     }
 
     /**
@@ -60,7 +63,7 @@ class PostsStatsService {
      * @param {StatsServiceOptions} options
      * @returns {Promise<{data: TopPostResult[]}>} The top posts based on the requested attribution metric
      */
-    async getTopPosts(options = {}) {
+    async getTopPosts(options) {
         try {
             const order = options.order || 'free_members desc';
             const limitRaw = Number.parseInt(String(options.limit ?? 20), 10); // Ensure options.limit is a string for parseInt
@@ -594,6 +597,283 @@ class PostsStatsService {
             };
         }
     }
+
+    /**
+     * Get stats for the latest published post including open rate, member attribution counts, and visitor count
+     * @returns {Promise<{data: Array<{id: string, title: string, slug: string, feature_image: string|null, published_at: string, recipient_count: number|null, opened_count: number|null, open_rate: number|null, member_delta: number, free_members: number, paid_members: number, visitors: number}>}>}
+     */
+    async getLatestPostStats() {
+        try {
+            // Get the latest published post
+            const latestPost = await this.knex('posts as p')
+                .select(
+                    'p.id',
+                    'p.uuid',
+                    'p.title',
+                    'p.slug',
+                    'p.feature_image',
+                    'p.published_at',
+                    'e.email_count',
+                    'e.opened_count'
+                )
+                .leftJoin('emails as e', 'p.id', 'e.post_id')
+                .where('p.status', 'published')
+                .whereNotNull('p.published_at')
+                .orderBy('p.published_at', 'desc')
+                .first();
+
+            if (!latestPost) {
+                return {data: []};
+            }
+
+            // Get member attribution counts using the same logic as other methods
+            const memberAttributionCounts = await this._getMemberAttributionCounts([latestPost.id]);
+            const attributionCount = memberAttributionCounts.find(ac => ac.post_id === latestPost.id);
+            
+            const freeMembers = attributionCount ? attributionCount.free_members : 0;
+            const paidMembers = attributionCount ? attributionCount.paid_members : 0;
+            const totalMembers = freeMembers + paidMembers;
+
+            // Calculate open rate
+            const openRate = latestPost.email_count ? 
+                (latestPost.opened_count / latestPost.email_count) * 100 : 
+                null;
+
+            // Get visitor count from Tinybird
+            let visitors = 0;
+            if (this.tinybirdClient) {
+                try {
+                    const dateFrom = new Date(latestPost.published_at).toISOString().split('T')[0];
+                    const visitorData = await this.tinybirdClient.fetch('api_top_pages', {
+                        post_uuid: latestPost.uuid,
+                        dateFrom: dateFrom
+                    });
+
+                    visitors = visitorData?.[0]?.visits || 0;
+                } catch (error) {
+                    logging.error('Error fetching visitor data from Tinybird:', error);
+                }
+            }
+
+            return {
+                data: [{
+                    id: latestPost.id,
+                    title: latestPost.title,
+                    slug: latestPost.slug,
+                    feature_image: latestPost.feature_image ? urlUtils.transformReadyToAbsolute(latestPost.feature_image) : latestPost.feature_image,
+                    published_at: latestPost.published_at,
+                    recipient_count: latestPost.email_count,
+                    opened_count: latestPost.opened_count,
+                    open_rate: openRate,
+                    member_delta: totalMembers,
+                    free_members: freeMembers,
+                    paid_members: paidMembers,
+                    visitors: visitors
+                }]
+            };
+        } catch (error) {
+            // Log the error but return a valid response
+            logging.error('Error fetching latest post stats:', error);
+            return {data: []};
+        }
+    }
+
+    /**
+     * Get top posts by views for a given date range
+     * @param {Object} options
+     * @param {string} options.date_from - Start date in YYYY-MM-DD format
+     * @param {string} options.date_to - End date in YYYY-MM-DD format
+     * @param {string} options.timezone - Timezone to use for date interpretation
+     * @param {number} [options.limit] - Maximum number of posts to return (default: 5)
+     * @returns {Promise<Object>} Top posts with view counts and additional Ghost data
+     */
+    async getTopPostsViews(options) {
+        try {
+            const limit = options.limit || 5;
+            let viewsData = [];
+
+            if (this.tinybirdClient) {
+                const tinybirdOptions = {
+                    dateFrom: options.date_from,
+                    dateTo: options.date_to,
+                    timezone: options.timezone,
+                    post_type: 'post',
+                    limit: limit
+                };
+
+                viewsData = await this.tinybirdClient.fetch('api_top_pages', tinybirdOptions) || [];
+            }
+
+            // Filter out any rows without post_uuid and get unique UUIDs
+            const postUuids = [...new Set(viewsData.filter(row => row.post_uuid).map(row => row.post_uuid))];
+            
+            // Get posts data from Ghost DB for the posts we have views for
+            const posts = await this.knex('posts as p')
+                .select(
+                    'p.id as post_id',
+                    'p.uuid as post_uuid',
+                    'p.title',
+                    'p.published_at',
+                    'p.feature_image',
+                    'emails.email_count',
+                    'emails.opened_count'
+                )
+                .leftJoin('emails', 'emails.post_id', 'p.id')
+                .whereIn('p.uuid', postUuids);
+
+            // Get member attribution counts for these posts (model after GrowthStats logic)
+            const memberAttributionCounts = await this._getMemberAttributionCounts(posts.map(p => p.post_id), options);
+
+            // Process posts with views
+            const postsWithViews = viewsData.map((row) => {
+                const post = posts.find(p => p.post_uuid === row.post_uuid);
+
+                if (!post) {
+                    return null;
+                }
+
+                // Find the member attribution count for this post
+                const attributionCount = memberAttributionCounts.find(ac => ac.post_id === post.post_id);
+                const memberCount = attributionCount ? (attributionCount.free_members + attributionCount.paid_members) : 0;
+
+                return {
+                    post_id: post.post_id,
+                    title: post.title,
+                    published_at: post.published_at,
+                    feature_image: post.feature_image ? urlUtils.transformReadyToAbsolute(post.feature_image) : post.feature_image,
+                    views: row.visits,
+                    open_rate: post.email_count > 0 ? (post.opened_count / post.email_count) * 100 : null,
+                    members: memberCount
+                };
+            }).filter(Boolean);
+
+            // Calculate how many more posts we need - we want to always return 5 posts
+            const remainingCount = limit - postsWithViews.length;
+
+            // If we need more posts, get the latest ones excluding the ones we already have
+            let additionalPosts = [];
+            let additionalMemberAttributionCounts = [];
+            if (remainingCount > 0) {
+                additionalPosts = await this.knex('posts as p')
+                    .select(
+                        'p.id as post_id',
+                        'p.uuid as post_uuid',
+                        'p.title',
+                        'p.published_at',
+                        'p.feature_image',
+                        'emails.email_count',
+                        'emails.opened_count'
+                    )
+                    .leftJoin('emails', 'emails.post_id', 'p.id')
+                    .whereNotIn('p.uuid', postUuids)
+                    .where('p.status', 'published')
+                    .whereNotNull('p.published_at')
+                    .orderBy('p.published_at', 'desc')
+                    .limit(remainingCount);
+
+                // Get member attribution counts for additional posts
+                if (additionalPosts.length > 0) {
+                    additionalMemberAttributionCounts = await this._getMemberAttributionCounts(additionalPosts.map(p => p.post_id), options);
+                }
+            }
+
+            // Process additional posts with 0 views
+            const additionalPostsWithZeroViews = additionalPosts.map((post) => {
+                // Find the member attribution count for this post
+                const attributionCount = additionalMemberAttributionCounts.find(ac => ac.post_id === post.post_id);
+                const memberCount = attributionCount ? (attributionCount.free_members + attributionCount.paid_members) : 0;
+
+                return {
+                    post_id: post.post_id,
+                    title: post.title,
+                    published_at: post.published_at,
+                    feature_image: post.feature_image ? urlUtils.transformReadyToAbsolute(post.feature_image) : post.feature_image,
+                    views: 0,
+                    open_rate: post.email_count > 0 ? (post.opened_count / post.email_count) * 100 : null,
+                    members: memberCount
+                };
+            });
+
+            // Combine both sets of posts
+            return [...postsWithViews, ...additionalPostsWithZeroViews];
+        } catch (error) {
+            logging.error('Error fetching top posts views:', error);
+            return [];
+        }
+    }
+
+    /**
+     * Get member attribution counts for a set of post IDs, modeling after GrowthStats logic
+     * Properly handles both free and paid members with deduplication
+     * @private
+     * @param {string[]} postIds - Array of post IDs to get attribution counts for
+     * @param {Object} options - Date filter options
+     * @returns {Promise<Array<{post_id: string, free_members: number, paid_members: number}>>}
+     */
+    async _getMemberAttributionCounts(postIds, options = {}) {
+        if (!postIds.length) {
+            return [];
+        }
+
+        try {
+            // Build free members query (modeled after _buildFreeMembersSubquery)
+            // Members who signed up on post but paid elsewhere/never
+            let freeMembersQuery = this.knex('members_created_events as mce')
+                .select('mce.attribution_id as post_id')
+                .countDistinct('mce.member_id as free_members')
+                .leftJoin('members_subscription_created_events as msce', function () {
+                    this.on('mce.member_id', '=', 'msce.member_id')
+                        .andOn('mce.attribution_id', '=', 'msce.attribution_id')
+                        .andOnVal('msce.attribution_type', '=', 'post');
+                })
+                .where('mce.attribution_type', 'post')
+                .whereIn('mce.attribution_id', postIds)
+                .whereNull('msce.id')
+                .groupBy('mce.attribution_id');
+
+            // Apply date filter to free members query
+            this._applyDateFilter(freeMembersQuery, options, 'mce.created_at');
+
+            // Build paid members query (modeled after _buildPaidMembersSubquery)
+            // Members whose paid conversion was attributed to this post
+            let paidMembersQuery = this.knex('members_subscription_created_events as msce')
+                .select('msce.attribution_id as post_id')
+                .countDistinct('msce.member_id as paid_members')
+                .where('msce.attribution_type', 'post')
+                .whereIn('msce.attribution_id', postIds)
+                .groupBy('msce.attribution_id');
+
+            // Apply date filter to paid members query
+            this._applyDateFilter(paidMembersQuery, options, 'msce.created_at');
+
+            // Execute both queries
+            const [freeResults, paidResults] = await Promise.all([
+                freeMembersQuery,
+                paidMembersQuery
+            ]);
+
+            // Combine results for each post
+            const combinedResults = postIds.map((postId) => {
+                const freeResult = freeResults.find(r => r.post_id === postId);
+                const paidResult = paidResults.find(r => r.post_id === postId);
+
+                return {
+                    post_id: postId,
+                    free_members: freeResult ? freeResult.free_members : 0,
+                    paid_members: paidResult ? paidResult.paid_members : 0
+                };
+            });
+
+            return combinedResults;
+        } catch (error) {
+            logging.error('Error fetching member attribution counts:', error);
+            return postIds.map(postId => ({
+                post_id: postId,
+                free_members: 0,
+                paid_members: 0
+            }));
+        }
+    }
 }
 
 module.exports = PostsStatsService;

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

@@ -89,6 +89,20 @@ class StatsService {
         return result;
     }
 
+    /**
+     * Get top posts by views
+     * @param {Object} options
+     * @param {string} options.date_from - Start date in YYYY-MM-DD format
+     * @param {string} options.date_to - End date in YYYY-MM-DD format
+     * @param {string} options.timezone - Timezone to use for date interpretation
+     * @param {number} [options.limit=5] - Maximum number of posts to return
+     * @returns {Promise<{data: import('./PostsStatsService').TopPostResult[]}>}
+     */
+    async getTopPostsViews(options) {
+        const result = await this.posts.getTopPostsViews(options);
+        return result;
+    }
+
     /**
      * @param {string} postId
      */
@@ -142,6 +156,14 @@ class StatsService {
         return result;
     }
 
+    /**
+     * Get stats for the latest published post
+     * @returns {Promise<{data: Object}>}
+     */
+    async getLatestPostStats() {
+        return await this.posts.getLatestPostStats();
+    }
+
     /**
      * @param {object} deps
      *
@@ -172,7 +194,7 @@ class StatsService {
             members: new MembersService(deps),
             subscriptions: new SubscriptionStatsService(deps),
             referrers: new ReferrersStatsService(deps),
-            posts: new PostsStatsService(deps),
+            posts: new PostsStatsService(depsWithTinybird),
             content: new ContentStatsService(depsWithTinybird)
         });
     }

package/core/server/services/stats/utils/tinybird.js

@@ -16,6 +16,7 @@ const create = ({config, request}) => {
      * @param {string} [options.dateTo] - End date in YYYY-MM-DD format
      * @param {string} [options.timezone] - Timezone for the query
      * @param {string} [options.memberStatus] - Member status filter (defaults to 'all')
+     * @param {string} [options.postType] - Post type filter
      * @param {string} [options.tbVersion] - Tinybird version for API URL
      * @returns {Object} Object with URL and request options
      */
@@ -34,12 +35,31 @@ const create = ({config, request}) => {
 
         // Use snake_case for query parameters as expected by Tinybird API
         const searchParams = {
-            site_uuid: statsConfig.id,
-            date_from: options.dateFrom,
-            date_to: options.dateTo,
-            timezone: options.timezone || config.get('timezone'),
-            member_status: options.memberStatus || 'all'
+            site_uuid: statsConfig.id
         };
+
+        // todo: refactor all uses to simply pass options through
+        if (options.dateFrom) {
+            searchParams.date_from = options.dateFrom;
+        }
+        if (options.dateTo) {
+            searchParams.date_to = options.dateTo;
+        }
+        if (options.timezone) {
+            searchParams.timezone = options.timezone;
+        }
+        if (options.memberStatus) {
+            searchParams.member_status = options.memberStatus;
+        }
+        if (options.postType) {
+            searchParams.post_type = options.postType;
+        }
+        // Add any other options that might be needed
+        Object.entries(options).forEach(([key, value]) => {
+            if (!['dateFrom', 'dateTo', 'timezone', 'memberStatus'].includes(key)) {
+                searchParams[key] = value;
+            }
+        });
         
         // Convert searchParams to query string and append to URL
         const queryString = new URLSearchParams(searchParams).toString();

package/core/server/web/api/endpoints/admin/routes.js

@@ -156,7 +156,9 @@ module.exports = function apiRoutes() {
     router.get('/stats/referrers/posts/:id', mw.authAdminApi, http(api.stats.postReferrers));
     router.get('/stats/referrers', mw.authAdminApi, http(api.stats.referrersHistory));
     if (labs.isSet('trafficAnalytics')) {
+        router.get('/stats/latest-post', mw.authAdminApi, http(api.stats.latestPost));
         router.get('/stats/top-posts', mw.authAdminApi, http(api.stats.topPosts));
+        router.get('/stats/top-posts-views', mw.authAdminApi, http(api.stats.topPostsViews));
         router.get('/stats/top-content', mw.authAdminApi, http(api.stats.topContent));
         router.get('/stats/newsletter-stats', mw.authAdminApi, http(api.stats.newsletterStats));
         router.get('/stats/subscriber-count', mw.authAdminApi, http(api.stats.subscriberCount));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ghost",
-  "version": "5.121.0",
+  "version": "5.123.0",
   "description": "The professional publishing platform",
   "author": "Ghost Foundation",
   "homepage": "https://ghost.org",
@@ -36,18 +36,18 @@
     "test:unit:base": "yarn test:base './test/unit' --timeout=2000",
     "test:integration": "yarn test:base './test/integration' --timeout=10000",
     "test:e2e": "yarn test:base ./test/e2e-* --timeout=15000",
-    "test:regression": "yarn test:base './test/regression' --timeout=60000",
+    "test:legacy": "yarn test:base './test/legacy' --timeout=60000",
     "test:browser": "NODE_ENV=testing-browser playwright test",
     "test:browser:admin": "NODE_ENV=testing-browser  playwright test test/e2e-browser --project=admin",
     "test:browser:portal": "NODE_ENV=testing-browser playwright test test/e2e-browser --project=portal",
     "test:browser:setup": "npx playwright install",
     "test:ci:e2e": "c8 -c ./.c8rc.e2e.json -o coverage-e2e yarn test:e2e -b",
-    "test:ci:regression": "yarn test:regression -b",
+    "test:ci:legacy": "yarn test:legacy -b",
     "test:ci:integration": "c8 -c ./.c8rc.e2e.json -o coverage-integration --lines 52 --functions 47 --branches 73 --statements 52 yarn test:integration -b",
     "test:unit:slow": "yarn test:unit --reporter=mocha-slow-test-reporter",
     "test:int:slow": "yarn test:integration --reporter=mocha-slow-test-reporter",
     "test:e2e:slow": "yarn test:e2e --reporter=mocha-slow-test-reporter",
-    "test:reg:slow": "mocha --reporter dot --require=./test/utils/overrides.js --exit --trace-warnings --recursive --extension=test.js  './test/regression' --timeout=60000 --reporter=mocha-slow-test-reporter",
+    "test:leg:slow": "mocha --reporter dot --require=./test/utils/overrides.js --exit --trace-warnings --recursive --extension=test.js  './test/legacy' --timeout=60000 --reporter=mocha-slow-test-reporter",
     "lint:server": "eslint --ignore-path .eslintignore 'core/server/**/*.js' 'core/*.js' '*.js' --cache",
     "lint:shared": "eslint --ignore-path .eslintignore 'core/shared/**/*.js' --cache",
     "lint:frontend": "eslint --ignore-path .eslintignore 'core/frontend/**/*.js' --cache",
@@ -79,11 +79,11 @@
     "@tryghost/domain-events": "1.0.1",
     "@tryghost/email-mock-receiver": "0.3.11",
     "@tryghost/errors": "1.3.8",
-    "@tryghost/helpers": "1.1.94",
+    "@tryghost/helpers": "1.1.95",
     "@tryghost/html-to-plaintext": "1.0.4",
     "@tryghost/http-cache-utils": "0.1.20",
-    "@tryghost/i18n": "file:components/tryghost-i18n-5.121.0.tgz",
-    "@tryghost/image-transform": "1.4.4",
+    "@tryghost/i18n": "file:components/tryghost-i18n-5.123.0.tgz",
+    "@tryghost/image-transform": "1.4.5",
     "@tryghost/job-manager": "1.0.1",
     "@tryghost/kg-card-factory": "5.1.1",
     "@tryghost/kg-clean-basic-html": "4.2.5",
@@ -107,7 +107,7 @@
     "@tryghost/pretty-cli": "1.2.47",
     "@tryghost/prometheus-metrics": "1.0.1",
     "@tryghost/promise": "0.3.15",
-    "@tryghost/referrer-parser": "0.1.5",
+    "@tryghost/referrer-parser": "0.1.7",
     "@tryghost/request": "1.0.11",
     "@tryghost/root-utils": "0.3.33",
     "@tryghost/security": "1.0.1",
@@ -158,7 +158,7 @@
     "ghost-storage-base": "1.0.0",
     "glob": "8.1.0",
     "got": "11.8.6",
-    "gscan": "4.48.1",
+    "gscan": "4.49.1",
     "handlebars": "4.7.8",
     "html-to-text": "5.1.1",
     "html5parser": "2.0.2",
@@ -192,7 +192,7 @@
     "mime-types": "2.1.35",
     "moment": "2.24.0",
     "moment-timezone": "0.5.45",
-    "multer": "2.0.0",
+    "multer": "2.0.1",
     "mysql2": "3.14.1",
     "nconf": "0.13.0",
     "node-fetch": "2.7.0",
@@ -211,7 +211,7 @@
     "stripe": "8.222.0",
     "superagent": "5.3.1",
     "superagent-throttle": "1.0.1",
-    "terser": "5.40.0",
+    "terser": "5.41.0",
     "tiny-glob": "0.2.9",
     "tough-cookie": "4.1.4",
     "ua-parser-js": "1.0.40",
@@ -231,7 +231,7 @@
     "@types/bookshelf": "1.2.9",
     "@types/common-tags": "1.8.4",
     "@types/jsonwebtoken": "9.0.9",
-    "@types/node": "22.15.27",
+    "@types/node": "22.15.30",
     "@types/node-jose": "1.1.13",
     "@types/nodemailer": "6.4.17",
     "@types/sinon": "17.0.4",
@@ -272,7 +272,7 @@
     "jackspeak": "2.3.6",
     "moment": "2.24.0",
     "moment-timezone": "0.5.45",
-    "@tryghost/i18n": "file:components/tryghost-i18n-5.121.0.tgz"
+    "@tryghost/i18n": "file:components/tryghost-i18n-5.123.0.tgz"
   },
   "nx": {
     "targets": {