ghost 6.9.1 → 6.9.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.9%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%22594913de7a%22%2C%22activitypubFilename%22%3A%22activitypub.js%22%2C%22activitypubHash%22%3A%2238e5073e2a%22%2C%22postsFilename%22%3A%22posts.js%22%2C%22postsHash%22%3A%22460f25b871%22%2C%22statsFilename%22%3A%22stats.js%22%2C%22statsHash%22%3A%22c820ebd57d%22%2C%22activitypubRemoteConfigUrl%22%3A%22%2F.ghost%2Factivitypub%2Fstable%2Fclient-config%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.9%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%223d200b447b%22%2C%22activitypubFilename%22%3A%22activitypub.js%22%2C%22activitypubHash%22%3A%2241a8ee70ff%22%2C%22postsFilename%22%3A%22posts.js%22%2C%22postsHash%22%3A%2273ad0a757c%22%2C%22statsFilename%22%3A%22stats.js%22%2C%22statsHash%22%3A%229c456bb0f1%22%2C%22activitypubRemoteConfigUrl%22%3A%22%2F.ghost%2Factivitypub%2Fstable%2Fclient-config%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" />
@@ -28,7 +28,7 @@
     </style>
 
     <link integrity="" rel="stylesheet" href="assets/vendor-0ede59da8efb5e28fa929557f7ff7154.css">
-    <link integrity="" rel="stylesheet" href="assets/ghost-f724c1d53f5402f78a2d8cf8beb7c716.css" title="light">
+    <link integrity="" rel="stylesheet" href="assets/ghost-192beb3c8f2f6e58b70d3aade481ae15.css" title="light">
 
     
 </head>
@@ -49,7 +49,7 @@
 
     <script src="assets/vendor-aed0068cf9b67d042dd23a6343545b7b.js"></script>
 <script src="assets/chunk.397.a720333cfffc99c47e71.js"></script>
-<script src="assets/chunk.524.56454d8add89b041f4df.js"></script>
-    <script src="assets/ghost-94d0fbb20e8e880fa9ba144cf26ab050.js"></script>
+<script src="assets/chunk.524.6d040cb21c767f0236ae.js"></script>
+    <script src="assets/ghost-5fd8d4d5e1ffe4d8405d30f3efba12b7.js"></script>
 </body>
 </html>

package/core/server/data/tinybird/datasources/_mv_hits.datasource

@@ -1,6 +1,9 @@
 SCHEMA >
     `site_uuid` LowCardinality(String),
     `timestamp` DateTime,
+    `received_at` DateTime64(3),
+    `inserted_at` DateTime64(3),
+    `ingestion_latency_ms` Int64,
     `action` LowCardinality(String),
     `version` LowCardinality(String),
     `session_id` String,
@@ -23,4 +26,4 @@ SCHEMA >
 
 ENGINE "MergeTree"
 ENGINE_PARTITION_KEY "toYYYYMM(timestamp)"
-ENGINE_SORTING_KEY "site_uuid, timestamp, session_id"
+ENGINE_SORTING_KEY "site_uuid, timestamp, session_id"

package/core/server/data/tinybird/endpoints/README.md

@@ -0,0 +1,109 @@
+# Tinybird Analytics Endpoints
+
+## Filtering Architecture
+
+### Session-Level vs Hit-Level Attributes
+
+Ghost analytics distinguishes between two types of attributes:
+
+#### Session-Level Attributes
+These are captured from the **first hit** (earliest timestamp) in a session using `argMin(field, timestamp)` in the `mv_session_data` materialized view:
+
+- `source` - Referring domain
+- `utm_source` - UTM source parameter
+- `utm_medium` - UTM medium parameter
+- `utm_campaign` - UTM campaign parameter
+- `utm_term` - UTM term parameter
+- `utm_content` - UTM content parameter
+
+Session-level attributes represent the **origin** of the session and remain constant throughout the entire session, even if subsequent pageviews have different UTM parameters or come from different sources.
+
+#### Hit-Level Attributes
+These can vary across pageviews within a session:
+
+- `pathname` - URL path of the page
+- `post_uuid` - UUID of the post/page
+- `member_status` - Member status at time of hit (can change during a session)
+
+### How Filtering Works
+
+All endpoint filtering is handled through the `filtered_sessions.pipe`, which uses a two-stage approach:
+
+**Stage 1: Query Filters (Hit-Level)**
+```sql
+NODE query_filters
+```
+Finds sessions where **at least one hit** matches the hit-level filter criteria (pathname, post_uuid, member_status). A session qualifies if ANY of its pageviews match the specified criteria.
+
+**Stage 2: Session Attributes (Session-Level)**
+```sql
+NODE sessions_filtered_by_session_attributes
+```
+Further filters by session-level attributes (source, utm_*) by joining with `mv_session_data`. These filters check attributes from the **first hit only**.
+
+**Stage 3: Final Output**
+```sql
+NODE filtered_sessions
+```
+Returns session IDs that match **all** filter criteria (both hit-level and session-level).
+
+### Important Behavior: All Hits from Matching Sessions
+
+When endpoints join `_mv_hits` with `filtered_sessions`, they return **ALL hits from sessions that match the filter criteria**, not just the specific hits that matched.
+
+#### Example: api_top_pages
+
+```sql
+select
+    post_uuid,
+    pathname,
+    uniqExact(session_id) as visits
+from _mv_hits h
+inner join filtered_sessions fs
+    on fs.session_id = h.session_id
+```
+
+**Scenario:** Filter by `utm_medium=social`
+
+If there are 5 sessions where the first hit had `utm_medium=social`:
+- The query returns ALL pageviews from those 5 sessions
+- A single session might visit multiple pages (e.g., /, /about/, /blog/post/)
+- Each page shows how many of the 5 sessions visited it
+- The sum of visits across all pages can exceed 5 because sessions are counted once per unique page they visited
+
+**Result:**
+```json
+{"pathname":"/about/","visits":3}     // 3 of the 5 sessions visited /about/
+{"pathname":"/","visits":3}            // 3 of the 5 sessions visited /
+{"pathname":"/blog/hello/","visits":2} // 2 of the 5 sessions visited /blog/hello/
+```
+
+Total: 8 page-session combinations from 5 unique sessions.
+
+This behavior answers the question: **"What pages did users visit when they came from [source/utm]?"** rather than **"Which specific pageviews had [source/utm] in the URL?"**
+
+### Filter Placement Rules
+
+When creating or modifying endpoints:
+
+1. **Session-level filters** (source, utm_*) → Only in `filtered_sessions.pipe`
+2. **Hit-level filters** (pathname, post_uuid, member_status) → Can be in both:
+   - `filtered_sessions.pipe` (for session qualification)
+   - Endpoint queries (for additional filtering of results)
+3. **Never duplicate** session-level filters in endpoint queries - always rely on `filtered_sessions`
+
+### API Endpoint Patterns
+
+All analytics endpoints follow this pattern:
+
+```sql
+from _mv_hits h
+inner join filtered_sessions fs
+    on fs.session_id = h.session_id
+where
+    site_uuid = {{ site_uuid }}
+    -- Date range filters
+    -- Hit-level filters only (if needed for this specific endpoint)
+```
+
+The join with `filtered_sessions` ensures only hits from sessions matching the filter criteria are included, while the `where` clause can apply additional hit-level filtering specific to the endpoint's purpose.

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

@@ -79,17 +79,6 @@ SQL >
                 on fs.session_id = sd.session_id
         where
             site_uuid = {{ String(site_uuid, 'mock_site_uuid', description="Tenant ID", required=True) }}
-            {% if defined(date_from) and day_diff(date_from, date_to) == 0 %}
-                and toDate(toTimezone(first_pageview, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) = {{ Date(date_from) }}
-            {% else %}
-                {% if defined(date_from) %} and toDate(toTimezone(first_pageview, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) >= {{ Date(date_from) }} {% else %} and toDate(toTimezone(first_pageview, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) >= timestampAdd(today(), interval -7 day) {% end %}
-                {% if defined(date_to) %} and toDate(toTimezone(first_pageview, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) <= {{ Date(date_to) }} {% else %} and toDate(toTimezone(first_pageview, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) <= today() {% end %}
-            {% end %}
-            {% if defined(utm_source) %} and utm_source = {{ String(utm_source, description="UTM source to filter on", required=False) }} {% end %}
-            {% if defined(utm_medium) %} and utm_medium = {{ String(utm_medium, description="UTM medium to filter on", required=False) }} {% end %}
-            {% if defined(utm_campaign) %} and utm_campaign = {{ String(utm_campaign, description="UTM campaign to filter on", required=False) }} {% end %}
-            {% if defined(utm_term) %} and utm_term = {{ String(utm_term, description="UTM term to filter on", required=False) }} {% end %}
-            {% if defined(utm_content) %} and utm_content = {{ String(utm_content, description="UTM content to filter on", required=False) }} {% end %}
 
 
 NODE data
@@ -131,24 +120,14 @@ SQL >
                 {% else %}
                     a.date = toDate(toTimezone(timestamp, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}}))
                 {% end %}
+            inner join filtered_sessions fs
+                on fs.session_id = h.session_id
             where
                 site_uuid = {{ String(site_uuid, 'mock_site_uuid', description="Tenant ID", required=True) }}
-                {% if defined(date_from) and day_diff(date_from, date_to) == 0 %}
-                    and toDate(toTimezone(timestamp, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) = {{ Date(date_from) }}
-                {% else %}
-                    {% if defined(date_from) %} and toDate(toTimezone(timestamp, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) >= {{ Date(date_from) }} {% else %} and toDate(toTimezone(timestamp, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) >= timestampAdd(today(), interval -7 day) {% end %}
-                    {% if defined(date_to) %} and toDate(toTimezone(timestamp, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) <= {{ Date(date_to) }} {% else %} and toDate(toTimezone(timestamp, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) <= today() {% end %}
-                {% end %}
                 {% if defined(member_status) %} and member_status IN {{ Array(member_status, "'undefined', 'free', 'paid'", description="Member status to filter on", required=False) }} {% end %}
-                {% if defined(source) %} and source = {{ String(source, description="Source to filter on", required=False) }} {% end %}
                 {% if defined(location) %} and location = {{ String(location, description="Location to filter on", required=False) }} {% end %}
                 {% if defined(pathname) %} and pathname = {{ String(pathname, description="Pathname to filter on", required=False) }} {% end %}
                 {% if defined(post_uuid) %} and post_uuid = {{String(post_uuid, description="Post UUID to filter on", required=False) }} {% end %}
-                {% if defined(utm_source) %} and utm_source = {{ String(utm_source, description="UTM source to filter on", required=False) }} {% end %}
-                {% if defined(utm_medium) %} and utm_medium = {{ String(utm_medium, description="UTM medium to filter on", required=False) }} {% end %}
-                {% if defined(utm_campaign) %} and utm_campaign = {{ String(utm_campaign, description="UTM campaign to filter on", required=False) }} {% end %}
-                {% if defined(utm_term) %} and utm_term = {{ String(utm_term, description="UTM term to filter on", required=False) }} {% end %}
-                {% if defined(utm_content) %} and utm_content = {{ String(utm_content, description="UTM content to filter on", required=False) }} {% end %}
             group by date
             order by date
 

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

@@ -4,15 +4,16 @@ TOKEN "axis" READ
 NODE ingestion_latency
 SQL >
     %
-    SELECT 
+    SELECT
         toDate(inserted_at) as date,
         site_uuid,
         inserted_at,
-        parseDateTimeBestEffort(JSONExtractString(payload, 'meta', 'received_timestamp'), 3) as received_timestamp,
-        dateDiff('millisecond', received_timestamp, inserted_at) as latency_ms
-    FROM analytics_events
-    WHERE 
-        JSONExtractString(payload, 'meta', 'received_timestamp') != ''
+        received_at,
+        ingestion_latency_ms
+    FROM _mv_hits
+    WHERE
+        -- ingestion_latency_ms is set to -1 if received_at is invalid
+        ingestion_latency_ms >= 0
         {% if defined(start_date) %}
             AND toDate(inserted_at) >= {{ Date(start_date, description="Start date for filtering", required=False) }}
         {% else %}
@@ -30,19 +31,19 @@ SQL >
 NODE ingestion_metrics
 SQL >
     %
-    SELECT 
+    SELECT
         date,
         {% if defined(site_uuid) %}
         site_uuid,
         {% end %}
         count() as total_events,
-        round(avg(latency_ms)) as avg_latency_ms,
-        round(quantile(0.5)(latency_ms)) as p50_latency_ms,
-        round(quantile(0.95)(latency_ms)) as p95_latency_ms,
-        round(min(latency_ms)) as min_latency_ms,
-        round(max(latency_ms)) as max_latency_ms
+        round(avg(ingestion_latency_ms)) as avg_latency_ms,
+        round(quantile(0.5)(ingestion_latency_ms)) as p50_latency_ms,
+        round(quantile(0.95)(ingestion_latency_ms)) as p95_latency_ms,
+        round(min(ingestion_latency_ms)) as min_latency_ms,
+        round(max(ingestion_latency_ms)) as max_latency_ms
     FROM ingestion_latency
     GROUP BY date{% if defined(site_uuid) %}, site_uuid{% end %}
     ORDER BY date DESC{% if defined(site_uuid) %}, site_uuid{% end %}
 
-TYPE ENDPOINT
+TYPE ENDPOINT

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

@@ -4,14 +4,15 @@ TOKEN "axis" READ
 NODE ingestion_latency
 SQL >
     %
-    SELECT 
+    SELECT
         site_uuid,
         inserted_at,
-        parseDateTimeBestEffort(JSONExtractString(payload, 'meta', 'received_timestamp'), 3) as received_timestamp,
-        dateDiff('millisecond', received_timestamp, inserted_at) as latency_ms
-    FROM analytics_events
-    WHERE 
-        JSONExtractString(payload, 'meta', 'received_timestamp') != ''
+        received_at,
+        ingestion_latency_ms
+    FROM _mv_hits
+    WHERE
+        -- ingestion_latency_ms is set to -1 if received_at is invalid
+        ingestion_latency_ms >= 0
         {% if defined(start_date) %}
             AND toDate(inserted_at) >= {{ Date(start_date, description="Start date for filtering", required=False) }}
         {% else %}
@@ -29,16 +30,16 @@ SQL >
 NODE ingestion_metrics
 SQL >
     %
-    SELECT 
+    SELECT
         {% if defined(site_uuid) %}
         site_uuid,
         {% end %}
         count() as total_events,
-        round(avg(latency_ms)) as avg_latency_ms,
-        round(quantile(0.5)(latency_ms)) as p50_latency_ms,
-        round(quantile(0.95)(latency_ms)) as p95_latency_ms,
-        round(min(latency_ms)) as min_latency_ms,
-        round(max(latency_ms)) as max_latency_ms
+        round(avg(ingestion_latency_ms)) as avg_latency_ms,
+        round(quantile(0.5)(ingestion_latency_ms)) as p50_latency_ms,
+        round(quantile(0.95)(ingestion_latency_ms)) as p95_latency_ms,
+        round(min(ingestion_latency_ms)) as min_latency_ms,
+        round(max(ingestion_latency_ms)) as max_latency_ms
     FROM ingestion_latency
     {% if defined(site_uuid) %}
     GROUP BY site_uuid

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

@@ -13,24 +13,6 @@ SQL >
             on fs.session_id = h.session_id
         where
             site_uuid = {{String(site_uuid, 'mock_site_uuid', description="Tenant ID", required=True)}}
-            {% if defined(date_from) %}
-                and toDate(toTimezone(timestamp, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}}))
-                >=
-                {{ Date(date_from, description="Starting day for filtering a date range", required=False) }}
-            {% else %}
-                and toDate(toTimezone(timestamp, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}}))
-                >=
-                timestampAdd(today(), interval -7 day)
-            {% end %}
-            {% if defined(date_to) %}
-                and toDate(toTimezone(timestamp, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}}))
-                <=
-                {{ Date(date_to, description="Finishing day for filtering a date range", required=False) }}
-            {% else %}
-                and toDate(toTimezone(timestamp, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}}))
-                <=
-                today()
-            {% end %}
             {% if defined(member_status) %}
                 and member_status IN (
                     select arrayJoin(
@@ -39,7 +21,6 @@ SQL >
                     )
                 )
             {% end %}
-            {% if defined(source) %} and source = {{ String(source, description="Source to filter on", required=False) }} {% end %}
             {% if defined(location) %} and location = {{ String(location, description="Location to filter on", required=False) }} {% end %}
             {% if defined(pathname) %} and pathname = {{ String(pathname, description="Pathname to filter on", required=False) }} {% end %}
             {% if defined(post_uuid) %} and post_uuid = {{ String(post_uuid, description="Post UUID to filter on", required=False) }} {% end %}

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

@@ -14,24 +14,6 @@ SQL >
         on fs.session_id = h.session_id
     where
         site_uuid = {{String(site_uuid, 'mock_site_uuid', description="Tenant ID", required=True)}}
-        {% if defined(date_from) %}
-            and toDate(toTimezone(timestamp, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}}))
-            >=
-            {{ Date(date_from, description="Starting day for filtering a date range", required=False) }}
-        {% else %}
-            and toDate(toTimezone(timestamp, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}}))
-            >=
-            timestampAdd(today(), interval -7 day)
-        {% end %}
-        {% if defined(date_to) %}
-            and toDate(toTimezone(timestamp, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}}))
-            <=
-            {{ Date(date_to, description="Finishing day for filtering a date range", required=False) }}
-        {% else %}
-            and toDate(toTimezone(timestamp, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}}))
-            <=
-            today()
-        {% end %}
         {% if defined(member_status) %}
             and member_status IN (
                 select arrayJoin(
@@ -50,11 +32,6 @@ SQL >
                 and (post_type != 'post' or post_type is null)
             {% end %}
         {% end %}
-        {% if defined(utm_source) %} and utm_source = {{ String(utm_source, description="UTM source to filter on", required=False) }} {% end %}
-        {% if defined(utm_medium) %} and utm_medium = {{ String(utm_medium, description="UTM medium to filter on", required=False) }} {% end %}
-        {% if defined(utm_campaign) %} and utm_campaign = {{ String(utm_campaign, description="UTM campaign to filter on", required=False) }} {% end %}
-        {% if defined(utm_term) %} and utm_term = {{ String(utm_term, description="UTM term to filter on", required=False) }} {% end %}
-        {% if defined(utm_content) %} and utm_content = {{ String(utm_content, description="UTM content to filter on", required=False) }} {% end %}
     group by post_uuid, pathname
     order by visits desc
     limit {{ Int32(skip, 0) }},{{ Int32(limit, 50) }}

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

@@ -12,17 +12,6 @@ SQL >
          on fs.session_id = sd.session_id
     where
         site_uuid = {{ String(site_uuid, 'mock_site_uuid', description="Tenant ID", required=True) }}
-        {% if defined(date_from) and day_diff(date_from, date_to) == 0 %}
-            and toDate(toTimezone(first_pageview, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) = {{ Date(date_from) }}
-        {% else %}
-            {% if defined(date_from) %} and toDate(toTimezone(first_pageview, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) >= {{ Date(date_from) }} {% else %} and toDate(toTimezone(first_pageview, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) >= timestampAdd(today(), interval -7 day) {% end %}
-            {% if defined(date_to) %} and toDate(toTimezone(first_pageview, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) <= {{ Date(date_to) }} {% else %} and toDate(toTimezone(first_pageview, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) <= today() {% end %}
-        {% end %}
-        {% if defined(utm_source) %} and utm_source = {{ String(utm_source, description="UTM source to filter on", required=False) }} {% end %}
-        {% if defined(utm_medium) %} and utm_medium = {{ String(utm_medium, description="UTM medium to filter on", required=False) }} {% end %}
-        {% if defined(utm_campaign) %} and utm_campaign = {{ String(utm_campaign, description="UTM campaign to filter on", required=False) }} {% end %}
-        {% if defined(utm_term) %} and utm_term = {{ String(utm_term, description="UTM term to filter on", required=False) }} {% end %}
-        {% if defined(utm_content) %} and utm_content = {{ String(utm_content, description="UTM content to filter on", required=False) }} {% end %}
     group by source
     order by visits desc
     limit {{ Int32(skip, 0) }},{{ Int32(limit, 50) }}

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

@@ -13,12 +13,6 @@ SQL >
     where
         site_uuid = {{ String(site_uuid, 'mock_site_uuid', description="Tenant ID", required=True) }}
         and utm_campaign != ''
-        {% if defined(date_from) and day_diff(date_from, date_to) == 0 %}
-            and toDate(toTimezone(first_pageview, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) = {{ Date(date_from) }}
-        {% else %}
-            {% if defined(date_from) %} and toDate(toTimezone(first_pageview, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) >= {{ Date(date_from) }} {% else %} and toDate(toTimezone(first_pageview, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) >= timestampAdd(today(), interval -7 day) {% end %}
-            {% if defined(date_to) %} and toDate(toTimezone(first_pageview, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) <= {{ Date(date_to) }} {% else %} and toDate(toTimezone(first_pageview, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) <= today() {% end %}
-        {% end %}
     group by utm_campaign
     order by visits desc
     limit {{ Int32(skip, 0) }},{{ Int32(limit, 50) }}

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

@@ -13,12 +13,6 @@ SQL >
     where
         site_uuid = {{ String(site_uuid, 'mock_site_uuid', description="Tenant ID", required=True) }}
         and utm_content != ''
-        {% if defined(date_from) and day_diff(date_from, date_to) == 0 %}
-            and toDate(toTimezone(first_pageview, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) = {{ Date(date_from) }}
-        {% else %}
-            {% if defined(date_from) %} and toDate(toTimezone(first_pageview, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) >= {{ Date(date_from) }} {% else %} and toDate(toTimezone(first_pageview, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) >= timestampAdd(today(), interval -7 day) {% end %}
-            {% if defined(date_to) %} and toDate(toTimezone(first_pageview, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) <= {{ Date(date_to) }} {% else %} and toDate(toTimezone(first_pageview, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) <= today() {% end %}
-        {% end %}
     group by utm_content
     order by visits desc
     limit {{ Int32(skip, 0) }},{{ Int32(limit, 50) }}

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

@@ -13,12 +13,6 @@ SQL >
     where
         site_uuid = {{ String(site_uuid, 'mock_site_uuid', description="Tenant ID", required=True) }}
         and utm_medium != ''
-        {% if defined(date_from) and day_diff(date_from, date_to) == 0 %}
-            and toDate(toTimezone(first_pageview, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) = {{ Date(date_from) }}
-        {% else %}
-            {% if defined(date_from) %} and toDate(toTimezone(first_pageview, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) >= {{ Date(date_from) }} {% else %} and toDate(toTimezone(first_pageview, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) >= timestampAdd(today(), interval -7 day) {% end %}
-            {% if defined(date_to) %} and toDate(toTimezone(first_pageview, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) <= {{ Date(date_to) }} {% else %} and toDate(toTimezone(first_pageview, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) <= today() {% end %}
-        {% end %}
     group by utm_medium
     order by visits desc
     limit {{ Int32(skip, 0) }},{{ Int32(limit, 50) }}

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

@@ -13,12 +13,6 @@ SQL >
     where
         site_uuid = {{ String(site_uuid, 'mock_site_uuid', description="Tenant ID", required=True) }}
         and utm_source != ''
-        {% if defined(date_from) and day_diff(date_from, date_to) == 0 %}
-            and toDate(toTimezone(first_pageview, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) = {{ Date(date_from) }}
-        {% else %}
-            {% if defined(date_from) %} and toDate(toTimezone(first_pageview, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) >= {{ Date(date_from) }} {% else %} and toDate(toTimezone(first_pageview, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) >= timestampAdd(today(), interval -7 day) {% end %}
-            {% if defined(date_to) %} and toDate(toTimezone(first_pageview, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) <= {{ Date(date_to) }} {% else %} and toDate(toTimezone(first_pageview, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) <= today() {% end %}
-        {% end %}
     group by utm_source
     order by visits desc
     limit {{ Int32(skip, 0) }},{{ Int32(limit, 50) }}

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

@@ -13,12 +13,6 @@ SQL >
     where
         site_uuid = {{ String(site_uuid, 'mock_site_uuid', description="Tenant ID", required=True) }}
         and utm_term != ''
-        {% if defined(date_from) and day_diff(date_from, date_to) == 0 %}
-            and toDate(toTimezone(first_pageview, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) = {{ Date(date_from) }}
-        {% else %}
-            {% if defined(date_from) %} and toDate(toTimezone(first_pageview, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) >= {{ Date(date_from) }} {% else %} and toDate(toTimezone(first_pageview, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) >= timestampAdd(today(), interval -7 day) {% end %}
-            {% if defined(date_to) %} and toDate(toTimezone(first_pageview, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) <= {{ Date(date_to) }} {% else %} and toDate(toTimezone(first_pageview, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) <= today() {% end %}
-        {% end %}
     group by utm_term
     order by visits desc
     limit {{ Int32(skip, 0) }},{{ Int32(limit, 50) }}

package/core/server/data/tinybird/pipes/filtered_sessions.pipe

@@ -1,8 +1,10 @@
 TOKEN "axis" READ
 
-NODE query_filters
+NODE sessions_filtered_by_hit_attributes
 DESCRIPTION >
-    Get sessions that match the filter criteria
+    Get sessions where at least one hit matches the hit-level filter criteria.
+    Hit-level filters (pathname, post_uuid, member_status, location) can vary across pageviews within a session.
+    A session qualifies if ANY of its hits match the specified criteria.
 
 SQL >
     %
@@ -20,22 +22,40 @@ SQL >
                 )
             )
         {% end %}
-        {% if defined(source) %} and source = {{ String(source, description="Source to filter on", required=False) }} {% end %}
         {% if defined(location) %} and location = {{ String(location, description="Location to filter on", required=False) }} {% end %}
         {% if defined(pathname) %} and pathname = {{ String(pathname, description="Pathname to filter on", required=False) }} {% end %}
-        {% if defined (post_uuid) %} and post_uuid = {{ String(post_uuid, description="Post UUID to filter on", required=False) }} {% end %}
+        {% if defined(post_uuid) %} and post_uuid = {{ String(post_uuid, description="Post UUID to filter on", required=False) }} {% end %}
 
-NODE sessions_filtered_by_source
+NODE sessions_filtered_by_session_attributes
 DESCRIPTION >
-    Further filter by source when using the source filter. This is necessary because the source is specific to the first hit in a session,
+    Further filter by session-level attributes (source, utm_*). This is necessary because these attributes are specific to the first hit in a session,
     whereas other filters are on hits.
 
 SQL >
     %
     select session_id
     from mv_session_data sd
-    inner join query_filters qf
-      on qf.session_id = sd.session_id
+    inner join sessions_filtered_by_hit_attributes sfha
+      on sfha.session_id = sd.session_id
     where
         site_uuid = {{ String(site_uuid, 'mock_site_uuid', description="Tenant ID", required=True) }}
+        {% if defined(date_from) %}
+            {# Filter from specified start date #}
+            and toDate(toTimezone(first_pageview,{{ String(timezone, 'Etc/UTC', description="Site timezone", required=True) }})) >= {{ Date(date_from) }}
+        {% else %}
+            {# Default to last 7 days if no start date provided #}
+            and toDate(toTimezone(first_pageview,{{ String(timezone, 'Etc/UTC', description="Site timezone", required=True) }})) >= timestampAdd(today(), interval -7 day)
+        {% end %}
+        {% if defined(date_to) %}
+            {# Filter to specified end date #}
+            and toDate(toTimezone(first_pageview, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) <= {{ Date(date_to) }}
+        {% else %}
+            {# Default to today if no end date provided #}
+            and toDate(toTimezone(first_pageview, {{String(timezone, 'Etc/UTC', description="Site timezone", required=True)}})) <= today()
+        {% end %}
         {% if defined(source) %} and source = {{ String(source, description="Source to filter on", required=False) }} {% end %}
+        {% if defined(utm_source) %} and utm_source = {{ String(utm_source, description="UTM source to filter on", required=False) }} {% end %}
+        {% if defined(utm_medium) %} and utm_medium = {{ String(utm_medium, description="UTM medium to filter on", required=False) }} {% end %}
+        {% if defined(utm_campaign) %} and utm_campaign = {{ String(utm_campaign, description="UTM campaign to filter on", required=False) }} {% end %}
+        {% if defined(utm_term) %} and utm_term = {{ String(utm_term, description="UTM term to filter on", required=False) }} {% end %}
+        {% if defined(utm_content) %} and utm_content = {{ String(utm_content, description="UTM content to filter on", required=False) }} {% end %}

package/core/server/data/tinybird/pipes/mv_hits.pipe

@@ -4,6 +4,10 @@ NODE mv_hits_0
 SQL >
 
     SELECT timestamp,
+        inserted_at,
+        -- payload.meta.received_timestamp may be missing or null
+        -- Nullable fields incur performance penalty in clickhouse, so we default to zero (unix epoch) instead of null.
+        parseDateTime64BestEffortOrZero(JSONExtractString(payload, 'meta', 'received_timestamp'), 3) as received_at,
         action,
         version,
         coalesce(session_id, '0') as session_id,
@@ -37,6 +41,14 @@ SQL >
     SELECT
         site_uuid,
         timestamp,
+        received_at,
+        inserted_at,
+        case
+            -- set to -1 if received_at is the unix epoch, or if received_at is after inserted_at
+            when toUnixTimestamp(received_at) = 0 then -1
+            when received_at > inserted_at then -1
+            else date_diff('millisecond', received_at, inserted_at)
+        end as ingestion_latency_ms,
         action,
         version,
         session_id,
@@ -54,20 +66,20 @@ SQL >
             when referrer IN ('Instagram', 'www.instagram.com') then 'Instagram'
             when referrer IN ('LinkedIn', 'LINKEDIN_COMPANY') then 'LinkedIn'
             when referrer IN ('l.threads.com') then 'Threads'
-            
+
             -- Reddit Ecosystem
             when referrer IN ('www.reddit.com', 'out.reddit.com', 'old.reddit.com', 'com.reddit.frontpage') then 'Reddit'
-            
+
             -- Search Engines (keep distinctions)
             when referrer IN ('search.brave.com') then 'Brave Search'
             when referrer IN ('www.ecosia.org') then 'Ecosia'
-            
+
             -- Email Services
             when referrer IN ('Gmail', 'com.google.android.gm', 'mail.google.com') then 'Gmail'
             when referrer IN ('Outlook.com') then 'Outlook'
             when referrer IN ('Yahoo!', 'www.yahoo.com', 'Yahoo! Mail', 'r.search.yahoo.com') then 'Yahoo!'
             when referrer IN ('AOL Mail') then 'AOL Mail'
-            
+
             -- Content Platforms
             when referrer IN ('flipboard', 'flipboard.com', 'flipboard.app') then 'Flipboard'
             when referrer IN ('substack', 'substack.com') then 'Substack'
@@ -75,22 +87,22 @@ SQL >
             when referrer IN ('buffer') then 'Buffer'
             when referrer IN ('Taboola') then 'Taboola'
             when referrer IN ('AppNexus') then 'AppNexus'
-            
+
             -- Wikipedia
             when referrer IN ('en.wikipedia.org', 'en.m.wikipedia.org') then 'Wikipedia'
-            
+
             -- Mastodon Network
             when referrer IN ('mastodon.social', 'mastodon.online', 'org.joinmastodon.android', 'phanpy.social', 'dev.phanpy.social') then 'Mastodon'
-            
+
             -- News Aggregators
             when referrer IN ('www.memeorandum.com', 'memeorandum.com') then 'Memeorandum'
             when referrer IN ('ground.news') then 'Ground News'
             when referrer IN ('apple.news') then 'Apple News'
             when referrer IN ('www.smartnews.com') then 'SmartNews'
-            
+
             -- Keep other sources as-is
-            when domainWithoutWWW(referrer) != '' then domainWithoutWWW(referrer) 
-            else referrer 
+            when domainWithoutWWW(referrer) != '' then domainWithoutWWW(referrer)
+            else referrer
         end as source,
         pathname,
         href,
@@ -137,4 +149,4 @@ SQL >
     FROM mv_hits_0
 
 TYPE materialized
-DATASOURCE _mv_hits
+DATASOURCE _mv_hits

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

@@ -94,19 +94,22 @@
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&utm_medium=social
   expected_result: |
     {"post_uuid":"06b1b0c9-fb53-4a15-a060-3db3fde7b1fc","pathname":"\/about\/","visits":3}
-    {"post_uuid":"","pathname":"\/","visits":2}
+    {"post_uuid":"","pathname":"\/","visits":3}
+    {"post_uuid":"6b8635fb-292f-4422-9fe4-d76cfab2ba31","pathname":"\/blog\/hello-world\/","visits":2}
 
 - name: Filtered by utm_campaign - brand_awareness
   description: Filtered by utm_campaign - brand_awareness
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&utm_campaign=brand_awareness
   expected_result: |
-    {"post_uuid":"","pathname":"\/","visits":1}
+    {"post_uuid":"","pathname":"\/","visits":2}
+    {"post_uuid":"06b1b0c9-fb53-4a15-a060-3db3fde7b1fc","pathname":"\/about\/","visits":1}
     {"post_uuid":"6b8635fb-292f-4422-9fe4-d76cfab2ba31","pathname":"\/blog\/hello-world\/","visits":1}
 
 - name: Filtered by utm_term - discount
   description: Filtered by utm_term - discount
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&utm_term=discount
   expected_result: |
+    {"post_uuid":"06b1b0c9-fb53-4a15-a060-3db3fde7b1fc","pathname":"\/about\/","visits":1}
     {"post_uuid":"6b8635fb-292f-4422-9fe4-d76cfab2ba31","pathname":"\/blog\/hello-world\/","visits":1}
 
 - name: Filtered by utm_content - post_123