ghost 6.0.0-rc.1 → 6.0.0-rc.3

package/core/built/admin/index.html

@@ -6,7 +6,7 @@
     <title>Ghost</title>
 
     
-<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22cdnUrl%22%3A%22%22%2C%22editorUrl%22%3A%22%22%2C%22rootURL%22%3A%22%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%226.0%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%2C%22editorFilename%22%3A%22koenig-lexical.umd.js%22%2C%22editorHash%22%3A%2237bd1e3e4d%22%2C%22adminXSettingsFilename%22%3A%22admin-x-settings.js%22%2C%22adminXSettingsHash%22%3A%22e84a455171%22%2C%22adminXActivitypubFilename%22%3A%22admin-x-activitypub.js%22%2C%22adminXActivitypubHash%22%3A%222cc57d68cb%22%2C%22postsFilename%22%3A%22posts.js%22%2C%22postsHash%22%3A%2235c19cc8c2%22%2C%22statsFilename%22%3A%22stats.js%22%2C%22statsHash%22%3A%22a6f5cdc099%22%2C%22adminXActivitypubCustomUrl%22%3A%22https%3A%2F%2Fcdn.jsdelivr.net%2Fghost%2Fadmin-x-activitypub%400%2Fdist%2Fadmin-x-activitypub.js%22%7D" />
+<meta name="ghost-admin/config/environment" content="%7B%22modulePrefix%22%3A%22ghost-admin%22%2C%22environment%22%3A%22production%22%2C%22cdnUrl%22%3A%22%22%2C%22editorUrl%22%3A%22%22%2C%22rootURL%22%3A%22%22%2C%22locationType%22%3A%22trailing-hash%22%2C%22EmberENV%22%3A%7B%22FEATURES%22%3A%7B%7D%2C%22EXTEND_PROTOTYPES%22%3A%7B%22Date%22%3Afalse%2C%22Array%22%3Atrue%2C%22String%22%3Atrue%2C%22Function%22%3Afalse%7D%2C%22_APPLICATION_TEMPLATE_WRAPPER%22%3Afalse%2C%22_JQUERY_INTEGRATION%22%3Atrue%2C%22_TEMPLATE_ONLY_GLIMMER_COMPONENTS%22%3Atrue%7D%2C%22APP%22%3A%7B%22version%22%3A%226.0%22%2C%22name%22%3A%22ghost-admin%22%7D%2C%22ember-simple-auth%22%3A%7B%7D%2C%22%40sentry%2Fember%22%3A%7B%22disablePerformance%22%3Atrue%2C%22sentry%22%3A%7B%7D%7D%2C%22ember-cli-mirage%22%3A%7B%22usingProxy%22%3Afalse%2C%22useDefaultPassthroughs%22%3Atrue%7D%2C%22exportApplicationGlobal%22%3Afalse%2C%22ember-load%22%3A%7B%22loadingIndicatorClass%22%3A%22ember-load-indicator%22%7D%2C%22editorFilename%22%3A%22koenig-lexical.umd.js%22%2C%22editorHash%22%3A%2237bd1e3e4d%22%2C%22adminXSettingsFilename%22%3A%22admin-x-settings.js%22%2C%22adminXSettingsHash%22%3A%223958492b48%22%2C%22adminXActivitypubFilename%22%3A%22admin-x-activitypub.js%22%2C%22adminXActivitypubHash%22%3A%22a6a89eb153%22%2C%22postsFilename%22%3A%22posts.js%22%2C%22postsHash%22%3A%221a3a628146%22%2C%22statsFilename%22%3A%22stats.js%22%2C%22statsHash%22%3A%229a36081a2d%22%2C%22adminXActivitypubCustomUrl%22%3A%22https%3A%2F%2Fcdn.jsdelivr.net%2Fghost%2Fadmin-x-activitypub%400%2Fdist%2Fadmin-x-activitypub.js%22%7D" />
 
     <meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1, maximum-scale=1, minimal-ui, viewport-fit=cover" />
     <meta name="pinterest" content="nopin" />
@@ -49,7 +49,7 @@
 
     <script src="assets/vendor-aed0068cf9b67d042dd23a6343545b7b.js"></script>
 <script src="assets/chunk.397.f965bec6bb556d2750de.js"></script>
-<script src="assets/chunk.524.f75344acd3938cf05152.js"></script>
-    <script src="assets/ghost-11843760824cb811ee4a35896c817a34.js"></script>
+<script src="assets/chunk.524.124c2d3b27c954a9aaa6.js"></script>
+    <script src="assets/ghost-338989d8cb5fce4a84d53ddd39ac80d4.js"></script>
 </body>
 </html>

package/core/server/api/endpoints/stats.js

@@ -533,12 +533,7 @@ const controller = {
             };
         },
         async query(frame) {
-            return await statsService.api.getTopSourcesWithRange(
-                frame.options.date_from, 
-                frame.options.date_to, 
-                frame.options.order || 'free_members desc',
-                frame.options.limit || 50
-            );
+            return await statsService.api.getTopSourcesWithRange(frame.options);
         }
     }
 

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

@@ -4,6 +4,8 @@ const urlUtils = require('../../../shared/url-utils');
 
 // Import source normalization from ReferrersStatsService
 const {normalizeSource} = require('./ReferrersStatsService');
+// Import centralized date utilities
+const {getDateBoundaries, applyDateFilter} = require('./utils/date-utils');
 
 /**
  * @typedef {Object} StatsServiceOptions
@@ -21,6 +23,7 @@ const {normalizeSource} = require('./ReferrersStatsService');
  * @property {number} [limit=20] - Maximum number of results to return
  * @property {string} [date_from] - Start date filter in YYYY-MM-DD format
  * @property {string} [date_to] - End date filter in YYYY-MM-DD format
+ * @property {string} [timezone='UTC'] - optional timezone for date interpretation
  * @property {string} [post_type] - Filter by post type ('post', 'page')
  */
 
@@ -99,6 +102,7 @@ class PostsStatsService {
             const limitRaw = Number.parseInt(String(options.limit ?? 20), 10);
             const limit = Number.isFinite(limitRaw) && limitRaw > 0 ? limitRaw : 20;
             const [orderField, orderDirection = 'desc'] = order.split(' ');
+            const {dateFrom, dateTo} = getDateBoundaries(options);
 
             if (!['free_members', 'paid_members', 'mrr'].includes(orderField)) {
                 throw new errors.BadRequestError({
@@ -142,27 +146,13 @@ class PostsStatsService {
                             const subquery1 = this.select('attribution_url', 'attribution_type', 'attribution_id')
                                 .from('members_created_events')
                                 .whereNotNull('attribution_url');
-                            if (options.date_from || options.date_to) {
-                                if (options.date_from) {
-                                    subquery1.where('created_at', '>=', options.date_from);
-                                }
-                                if (options.date_to) {
-                                    subquery1.where('created_at', '<=', options.date_to + ' 23:59:59');
-                                }
-                            }
+                            applyDateFilter(subquery1, dateFrom, dateTo, 'created_at');
                             
                             subquery1.union(function () {
                                 const subquery2 = this.select('attribution_url', 'attribution_type', 'attribution_id')
                                     .from('members_subscription_created_events')
                                     .whereNotNull('attribution_url');
-                                if (options.date_from || options.date_to) {
-                                    if (options.date_from) {
-                                        subquery2.where('created_at', '>=', options.date_from);
-                                    }
-                                    if (options.date_to) {
-                                        subquery2.where('created_at', '<=', options.date_to + ' 23:59:59');
-                                    }
-                                }
+                                applyDateFilter(subquery2, dateFrom, dateTo, 'created_at');
                             })
                                 .as('combined');
                         })
@@ -462,6 +452,7 @@ class PostsStatsService {
         const selectField = groupByUrl ? 'mce.attribution_url' : 'mce.attribution_id as post_id';
         const groupByField = groupByUrl ? 'mce.attribution_url' : 'mce.attribution_id';
         const joinCondition = groupByUrl ? 'mce.attribution_url' : 'mce.attribution_id';
+        const {dateFrom, dateTo} = getDateBoundaries(options);
         
         let subquery = knex('members_created_events as mce')
             .select(selectField)
@@ -507,7 +498,7 @@ class PostsStatsService {
             }
         }
 
-        this._applyDateFilter(subquery, options, 'mce.created_at');
+        applyDateFilter(subquery, dateFrom, dateTo, 'mce.created_at');
         return subquery;
     }
 
@@ -523,6 +514,7 @@ class PostsStatsService {
         const knex = this.knex;
         const selectField = groupByUrl ? 'msce.attribution_url' : 'msce.attribution_id as post_id';
         const groupByField = groupByUrl ? 'msce.attribution_url' : 'msce.attribution_id';
+        const {dateFrom, dateTo} = getDateBoundaries(options);
         
         let subquery = knex('members_subscription_created_events as msce')
             .select(selectField)
@@ -551,7 +543,7 @@ class PostsStatsService {
             }
         }
 
-        this._applyDateFilter(subquery, options, 'msce.created_at');
+        applyDateFilter(subquery, dateFrom, dateTo, 'msce.created_at');
         return subquery;
     }
 
@@ -566,6 +558,7 @@ class PostsStatsService {
     _buildMrrSubquery(options, groupByUrl = false) {
         const selectField = groupByUrl ? 'msce.attribution_url' : 'msce.attribution_id as post_id';
         const groupByField = groupByUrl ? 'msce.attribution_url' : 'msce.attribution_id';
+        const {dateFrom, dateTo} = getDateBoundaries(options);
         
         let subquery = this.knex('members_subscription_created_events as msce')
             .select(selectField)
@@ -599,7 +592,7 @@ class PostsStatsService {
             }
         }
 
-        this._applyDateFilter(subquery, options, 'msce.created_at');
+        applyDateFilter(subquery, dateFrom, dateTo, 'msce.created_at');
         return subquery;
     }
 
@@ -615,6 +608,7 @@ class PostsStatsService {
      */
     _buildFreeReferrersSubquery(postId, options) {
         const knex = this.knex;
+        const {dateFrom, dateTo} = getDateBoundaries(options);
 
         // Simpler approach mirroring _buildFreeMembersSubquery
         let subquery = knex('members_created_events as mce')
@@ -631,7 +625,7 @@ class PostsStatsService {
             .whereNull('msce.id') // Keep only signups where no matching paid conversion (same post/referrer) exists
             .groupBy('mce.referrer_source');
 
-        this._applyDateFilter(subquery, options, 'mce.created_at'); // Filter based on signup time
+        applyDateFilter(subquery, dateFrom, dateTo, 'mce.created_at');
         return subquery;
     }
 
@@ -645,6 +639,7 @@ class PostsStatsService {
     */
     _buildPaidReferrersSubquery(postId, options) {
         const knex = this.knex;
+        const {dateFrom, dateTo} = getDateBoundaries(options);
         let subquery = knex('members_subscription_created_events as msce')
             .select('msce.referrer_source as source')
             .countDistinct('msce.member_id as paid_members')
@@ -652,8 +647,7 @@ class PostsStatsService {
             .where('msce.attribution_type', 'post')
             .groupBy('msce.referrer_source');
 
-        // Apply date filter to the paid conversion event timestamp
-        this._applyDateFilter(subquery, options, 'msce.created_at');
+        applyDateFilter(subquery, dateFrom, dateTo, 'msce.created_at');
         return subquery;
     }
 
@@ -667,6 +661,7 @@ class PostsStatsService {
      */
     _buildMrrReferrersSubquery(postId, options) {
         const knex = this.knex;
+        const {dateFrom, dateTo} = getDateBoundaries(options);
         let subquery = knex('members_subscription_created_events as msce')
             .select('msce.referrer_source as source')
             .sum('mpse.mrr_delta as mrr')
@@ -679,51 +674,10 @@ class PostsStatsService {
             .where('msce.attribution_type', 'post')
             .groupBy('msce.referrer_source');
 
-        // Apply date filter to the paid conversion event timestamp
-        this._applyDateFilter(subquery, options, 'msce.created_at');
+        applyDateFilter(subquery, dateFrom, dateTo, 'msce.created_at');
         return subquery;
     }
 
-    /**
-     * Apply date filters to a query builder instance
-     * @private
-     * @param {import('knex').Knex.QueryBuilder} query
-     * @param {StatsServiceOptions} options
-     * @param {string} dateColumn - The date column to filter on
-     */
-    _applyDateFilter(query, options, dateColumn) {
-        // Note: Timezone handling might require converting dates before querying,
-        // depending on how created_at is stored (UTC assumed here).
-        if (options.date_from) {
-            try {
-                // Attempt to parse and validate the date
-                const fromDate = new Date(options.date_from);
-                if (!isNaN(fromDate.getTime())) {
-                    query.where(dateColumn, '>=', fromDate);
-                } else {
-                    logging.warn(`Invalid date_from format: ${options.date_from}. Skipping filter.`);
-                }
-            } catch (e) {
-                logging.warn(`Error parsing date_from: ${options.date_from}. Skipping filter.`);
-            }
-        }
-        if (options.date_to) {
-            try {
-                const toDate = new Date(options.date_to);
-                if (!isNaN(toDate.getTime())) {
-                    // Include the whole day for the 'to' date by setting to end of day
-                    const endOfDay = new Date(toDate);
-                    endOfDay.setHours(23, 59, 59, 999);
-                    query.where(dateColumn, '<=', endOfDay);
-                } else {
-                    logging.warn(`Invalid date_to format: ${options.date_to}. Skipping filter.`);
-                }
-            } catch (e) {
-                logging.warn(`Error parsing date_to: ${options.date_to}. Skipping filter.`);
-            }
-        }
-    }
-
     /**
      * Get newsletter stats for sent or published posts with a specific newsletter_id
      *
@@ -733,6 +687,7 @@ class PostsStatsService {
      * @param {number|string} [options.limit=20] - Maximum number of results to return
      * @param {string} [options.date_from] - Optional start date filter (YYYY-MM-DD)
      * @param {string} [options.date_to] - Optional end date filter (YYYY-MM-DD)
+     * @param {string} [options.timezone] - Timezone to use for date interpretation
      * @returns {Promise<{data: NewsletterStatResult[]}>} The newsletter stats for sent/published posts with the specified newsletter_id
      */
     async getNewsletterStats(newsletterId, options = {}) {
@@ -740,6 +695,7 @@ class PostsStatsService {
             const order = options.order || 'date desc';
             const limitRaw = Number.parseInt(String(options.limit ?? 20), 10);
             const limit = Number.isFinite(limitRaw) && limitRaw > 0 ? limitRaw : 20;
+            const {dateFrom, dateTo} = getDateBoundaries(options);
 
             // Parse order field and direction
             let [orderField, orderDirection = 'desc'] = order.split(' ');
@@ -766,19 +722,6 @@ class PostsStatsService {
                 });
             }
 
-            // Build date filters if provided
-            let dateFilter = this.knex.raw('1=1');
-            if (options.date_from) {
-                dateFilter = this.knex.raw(`p.published_at >= ?`, [options.date_from]);
-            }
-            if (options.date_to) {
-                // Make date_to inclusive of the entire day by adding 23:59:59
-                const endOfDay = options.date_to + ' 23:59:59';
-                dateFilter = options.date_from
-                    ? this.knex.raw(`p.published_at >= ? AND p.published_at <= ?`, [options.date_from, endOfDay])
-                    : this.knex.raw(`p.published_at <= ?`, [endOfDay]);
-            }
-
             // Subquery to count clicks from members_click_events
             const clicksSubquery = this.knex
                 .select('r.post_id')
@@ -806,11 +749,12 @@ class PostsStatsService {
                 .leftJoin(clicksSubquery, 'p.id', 'clicks.post_id')
                 .where('p.newsletter_id', newsletterId)
                 .whereIn('p.status', ['sent', 'published'])
-                // Show all newsletters that were sent, even if no email record exists or has 0 engagement
-                .whereRaw(dateFilter)
                 .orderBy(orderFieldMap[orderField], orderDirection)
                 .limit(limit);
 
+            // Apply centralized date filtering
+            applyDateFilter(query, dateFrom, dateTo, 'p.published_at');
+
             const results = await query;
 
             return {data: results};
@@ -829,6 +773,7 @@ class PostsStatsService {
      * @param {number} [options.limit] - Number of results to return (default: 20)
      * @param {string} [options.date_from] - Optional start date filter (YYYY-MM-DD)
      * @param {string} [options.date_to] - Optional end date filter (YYYY-MM-DD)
+     * @param {string} [options.timezone] - Timezone to use for date interpretation
      * @returns {Promise<{data: Array}>} The newsletter basic stats (with click data when ordering by click_rate)
      */
     async getNewsletterBasicStats(newsletterId, options = {}) {
@@ -836,6 +781,7 @@ class PostsStatsService {
             const order = options.order || 'date desc';
             const limitRaw = Number.parseInt(String(options.limit ?? 20), 10);
             const limit = Number.isFinite(limitRaw) && limitRaw > 0 ? limitRaw : 20;
+            const {dateFrom, dateTo} = getDateBoundaries(options);
 
             // Parse order field and direction
             let [orderField, orderDirection = 'desc'] = order.split(' ');
@@ -862,19 +808,6 @@ class PostsStatsService {
                 });
             }
 
-            // Build date filters if provided
-            let dateFilter = this.knex.raw('1=1');
-            if (options.date_from) {
-                dateFilter = this.knex.raw(`p.published_at >= ?`, [options.date_from]);
-            }
-            if (options.date_to) {
-                // Make date_to inclusive of the entire day by adding 23:59:59
-                const endOfDay = options.date_to + ' 23:59:59';
-                dateFilter = options.date_from
-                    ? this.knex.raw(`p.published_at >= ? AND p.published_at <= ?`, [options.date_from, endOfDay])
-                    : this.knex.raw(`p.published_at <= ?`, [endOfDay]);
-            }
-
             let query;
 
             // If ordering by click_rate, we need to include click data
@@ -906,10 +839,11 @@ class PostsStatsService {
                     .leftJoin(clicksSubquery, 'p.id', 'clicks.post_id')
                     .where('p.newsletter_id', newsletterId)
                     .whereIn('p.status', ['sent', 'published'])
-                    // Show all newsletters that were sent, even if no email record exists or has 0 engagement
-                    .whereRaw(dateFilter)
                     .orderBy(orderFieldMap[orderField], orderDirection)
                     .limit(limit);
+                    
+                // Apply centralized date filtering
+                applyDateFilter(query, dateFrom, dateTo, 'p.published_at');
             } else {
                 // Build the query without click data for better performance
                 query = this.knex
@@ -925,10 +859,11 @@ class PostsStatsService {
                     .leftJoin('emails as e', 'p.id', 'e.post_id')
                     .where('p.newsletter_id', newsletterId)
                     .whereIn('p.status', ['sent', 'published'])
-                    // Show all newsletters that were sent, even if no email record exists or has 0 engagement
-                    .whereRaw(dateFilter)
                     .orderBy(orderFieldMap[orderField], orderDirection)
                     .limit(limit);
+                    
+                // Apply centralized date filtering
+                applyDateFilter(query, dateFrom, dateTo, 'p.published_at');
             }
 
             const results = await query;
@@ -996,6 +931,7 @@ class PostsStatsService {
      * @param {Object} options - Query options
      * @param {string} [options.date_from] - Optional start date filter (YYYY-MM-DD)
      * @param {string} [options.date_to] - Optional end date filter (YYYY-MM-DD)
+     * @param {string} [options.timezone] - Timezone to use for date interpretation
      * @returns {Promise<{data: Array<{total: number, deltas: Array<{date: string, value: number}>}>}>} The newsletter subscriber stats
      */
     async getNewsletterSubscriberStats(newsletterId, options = {}) {
@@ -1055,8 +991,15 @@ class PostsStatsService {
     /**
      * Optimized query to get newsletter subscriber deltas
      * @private
+     * @param {string} newsletterId - ID of the newsletter to get subscriber deltas for
+     * @param {Object} options - Query options
+     * @param {string} [options.date_from] - Optional start date filter (YYYY-MM-DD)
+     * @param {string} [options.date_to] - Optional end date filter (YYYY-MM-DD)
+     * @param {string} [options.timezone] - Timezone to use for date interpretation
      */
     async _getNewsletterSubscriberDeltas(newsletterId, options = {}) {
+        const {dateFrom, dateTo} = getDateBoundaries(options);
+        
         // Build optimized deltas query - avoid expensive JOIN
         let deltasQuery = this.knex('members_subscribe_events as mse')
             .select(
@@ -1073,13 +1016,8 @@ class PostsStatsService {
             .groupByRaw('DATE(mse.created_at)')
             .orderBy('date', 'asc');
 
-        // Apply date filters early to reduce dataset
-        if (options.date_from) {
-            deltasQuery.where('mse.created_at', '>=', options.date_from);
-        }
-        if (options.date_to) {
-            deltasQuery.where('mse.created_at', '<=', `${options.date_to} 23:59:59`);
-        }
+        // Apply timezone-aware date filters
+        applyDateFilter(deltasQuery, dateFrom, dateTo, 'mse.created_at');
 
         return await deltasQuery;
     }
@@ -1369,6 +1307,9 @@ class PostsStatsService {
      * @private
      * @param {string[]} postIds - Array of post IDs to get attribution counts for
      * @param {Object} options - Date filter 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
      * @returns {Promise<Array<{post_id: string, free_members: number, paid_members: number}>>}
      */
     async _getMemberAttributionCounts(postIds, options = {}) {
@@ -1376,6 +1317,8 @@ class PostsStatsService {
             return [];
         }
 
+        const {dateFrom, dateTo} = getDateBoundaries(options);
+
         try {
             // Build free members query (modeled after _buildFreeMembersSubquery)
             // Members who signed up on post but paid elsewhere/never
@@ -1393,7 +1336,7 @@ class PostsStatsService {
                 .groupBy('mce.attribution_id');
 
             // Apply date filter to free members query
-            this._applyDateFilter(freeMembersQuery, options, 'mce.created_at');
+            applyDateFilter(freeMembersQuery, dateFrom, dateTo, 'mce.created_at');
 
             // Build paid members query (modeled after _buildPaidMembersSubquery)
             // Members whose paid conversion was attributed to this post
@@ -1405,7 +1348,7 @@ class PostsStatsService {
                 .groupBy('msce.attribution_id');
 
             // Apply date filter to paid members query
-            this._applyDateFilter(paidMembersQuery, options, 'msce.created_at');
+            applyDateFilter(paidMembersQuery, dateFrom, dateTo, 'msce.created_at');
 
             // Execute both queries
             const [freeResults, paidResults] = await Promise.all([