ghost 6.8.1 → 6.9.0

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.8%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%227f93a89e16%22%2C%22activitypubFilename%22%3A%22activitypub.js%22%2C%22activitypubHash%22%3A%2251c307dd9b%22%2C%22postsFilename%22%3A%22posts.js%22%2C%22postsHash%22%3A%22feacf15ba2%22%2C%22statsFilename%22%3A%22stats.js%22%2C%22statsHash%22%3A%22e0aadbd487%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%22a4b3b38319%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="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-ca67b9eb701b867ae2a2fdd76cebdc17.css" title="light">
+    <link integrity="" rel="stylesheet" href="assets/ghost-f724c1d53f5402f78a2d8cf8beb7c716.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.bc2b771f38286b4a51ed.js"></script>
-    <script src="assets/ghost-7556359b8bd4ec08a6c23890b04bb56e.js"></script>
+<script src="assets/chunk.524.774a2df444e2ffde4942.js"></script>
+    <script src="assets/ghost-94d0fbb20e8e880fa9ba144cf26ab050.js"></script>
 </body>
 </html>

package/core/frontend/public/robots.txt

@@ -5,3 +5,4 @@ Disallow: /email/
 Disallow: /members/api/comments/counts/
 Disallow: /r/
 Disallow: /webmentions/receive/
+Disallow: /.ghost/analytics/api/

package/core/frontend/web/middleware/index.js

@@ -4,7 +4,6 @@ module.exports = {
     frontendCaching: require('./frontend-caching'),
     handleImageSizes: require('./handle-image-sizes'),
     redirectGhostToAdmin: require('./redirect-ghost-to-admin'),
-    serveFavicon: require('./serve-favicon'),
     servePublicFile: require('./serve-public-file'),
     staticTheme: require('./static-theme')
 };

package/core/frontend/web/routers/serve-favicon.js

@@ -0,0 +1,56 @@
+const fs = require('fs-extra');
+const path = require('path');
+const crypto = require('crypto');
+const config = require('../../../shared/config');
+const {blogIcon} = require('../../../server/lib/image');
+const urlUtils = require('../../../shared/url-utils');
+const settingsCache = require('../../../shared/settings-cache');
+
+const buildContentResponse = (ext, buf) => {
+    return {
+        headers: {
+            'Content-Type': `image/${ext}`,
+            'Content-Length': buf.length,
+            ETag: `"${crypto.createHash('md5').update(buf, 'utf8').digest('hex')}"`,
+            'Cache-Control': `public, max-age=${config.get('caching:favicon:maxAge')}`
+        },
+        body: buf
+    };
+};
+
+// Handles requests to /favicon.ico, /favicon.png, /favicon.jpg, /favicon.jpeg
+module.exports = function serveFavicon(siteApp) {
+    siteApp.get(/^\/favicon\.(ico|png|jpe?g)$/i, (req, res, next) => {
+        // CASE: favicon is default
+        // confusing: if you upload an icon, it's same logic as storing images
+        // we store as /content/images, because this is the url path images get requested via the browser
+        // we are using an express route to skip /content/images and the result is a image path
+        // based on config.getContentPath('images') + req.path
+        // in this case we don't use path rewrite, that's why we have to make it manually
+        const filePath = blogIcon.getIconPath();
+        const originalExtension = path.extname(filePath).toLowerCase();
+        const requestedExtension = path.extname(req.path).toLowerCase();
+
+        // CASE: custom favicon exists, load it from local file storage
+        if (settingsCache.get('icon')) {
+            // Always redirect to the icon path, which is never favicon.xxx
+            return res.redirect(302, blogIcon.getIconUrl());
+        }
+
+        // CASE: always redirect to .ico for default icon
+        if (originalExtension !== requestedExtension) {
+            return res.redirect(302, urlUtils.urlFor({relativeUrl: '/favicon.ico'}));
+        }
+
+        fs.readFile(filePath, (err, buf) => {
+            if (err) {
+                return next(err);
+            }
+
+            const content = buildContentResponse('x-icon', buf);
+
+            res.writeHead(200, content.headers);
+            res.end(content.body);
+        });
+    });
+};

package/core/frontend/web/site.js

@@ -9,6 +9,7 @@ const config = require('../../shared/config');
 const storage = require('../../server/adapters/storage');
 const urlUtils = require('../../shared/url-utils');
 const sitemapHandler = require('../services/sitemap/handler');
+const serveFavicon = require('./routers/serve-favicon');
 const themeEngine = require('../services/theme-engine');
 const themeMiddleware = themeEngine.middleware;
 const membersService = require('../../server/services/members');
@@ -62,7 +63,7 @@ module.exports = function setupSiteApp(routerConfig) {
     // Static content/assets
     // @TODO make sure all of these have a local 404 error handler
     // Favicon
-    siteApp.use(mw.serveFavicon());
+    serveFavicon(siteApp);
 
     // Serve sitemap.xsl file
     siteApp.use(mw.servePublicFile('static', 'sitemap.xsl', 'text/xsl', config.get('caching:sitemapXSL:maxAge')));

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

@@ -140,9 +140,6 @@ SQL >
                     {% 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(device) %} and device = {{ String(device, description="Device to filter on", required=False) }} {% end %}
-                {% if defined(browser) %} and browser = {{ String(browser, description="Browser to filter on", required=False) }} {% end %}
-                {% if defined(os) %} and os = {{ String(os, description="Operating system 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 %}

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

@@ -39,9 +39,6 @@ SQL >
                     )
                 )
             {% end %}
-            {% if defined(device) %} and device = {{ String(device, description="Device to filter on", required=False) }} {% end %}
-            {% if defined(browser) %} and browser = {{ String(browser, description="Browser to filter on", required=False) }} {% end %}
-            {% if defined(os) %} and os = {{ String(os, description="Operating system 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 %}

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

@@ -40,11 +40,6 @@ SQL >
                 )
             )
         {% end %}
-        {% if defined(device) %} and device = {{ String(device, description="Device to filter on", required=False) }} {% end %}
-        {% if defined(browser) %} and browser = {{ String(browser, description="Browser to filter on", required=False) }} {% end %}
-        {% if defined(os) %} and os = {{ String(os, description="Operating system to filter on", required=False) }} {% end %}
-        -- we do filtering on source in the filtered_sessions pipe
-        # --{% 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/pipes/filtered_sessions.pipe

@@ -20,9 +20,6 @@ SQL >
                 )
             )
         {% end %}
-        {% if defined(device) %} and device = {{ String(device, description="Device to filter on", required=False) }} {% end %}
-        {% if defined(browser) %} and browser = {{ String(browser, description="Browser to filter on", required=False) }} {% end %}
-        {% if defined(os) %} and os = {{ String(os, description="Operating system 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 %}

package/core/server/data/tinybird/scripts/analytics-generator.js

@@ -111,6 +111,59 @@ class AnalyticsEventGenerator {
         this.locales = [
             'en-US', 'en-GB', 'es-ES', 'fr-FR', 'de-DE', 'it-IT', 'pt-BR', 'ja-JP', 'ko-KR', 'zh-CN'
         ];
+
+        // UTM parameters for realistic campaign tracking
+        this.utmSources = [
+            {value: 'google', weight: 25},
+            {value: 'facebook', weight: 15},
+            {value: 'twitter', weight: 12},
+            {value: 'linkedin', weight: 10},
+            {value: 'reddit', weight: 8},
+            {value: 'newsletter', weight: 15},
+            {value: 'email', weight: 10},
+            {value: 'bluesky', weight: 5}
+        ];
+
+        this.utmMediums = [
+            {value: 'cpc', weight: 30}, // Paid search
+            {value: 'social', weight: 25}, // Social media
+            {value: 'email', weight: 20}, // Email campaigns
+            {value: 'organic', weight: 15}, // Organic search
+            {value: 'referral', weight: 10} // Referral traffic
+        ];
+
+        this.utmCampaigns = [
+            {value: 'spring_sale_2024', weight: 15},
+            {value: 'product_launch', weight: 12},
+            {value: 'weekly_newsletter', weight: 20},
+            {value: 'summer_promotion', weight: 10},
+            {value: 'black_friday', weight: 8},
+            {value: 'holiday_special', weight: 8},
+            {value: 'retargeting', weight: 12},
+            {value: 'brand_awareness', weight: 10},
+            {value: 'lead_generation', weight: 5}
+        ];
+
+        this.utmContents = [
+            {value: 'header_cta', weight: 20},
+            {value: 'sidebar_banner', weight: 15},
+            {value: 'footer_link', weight: 10},
+            {value: 'inline_text', weight: 15},
+            {value: 'hero_button', weight: 20},
+            {value: 'popup_form', weight: 10},
+            {value: 'video_thumbnail', weight: 10}
+        ];
+
+        this.utmTerms = [
+            {value: 'ghost_cms', weight: 15},
+            {value: 'blogging_platform', weight: 12},
+            {value: 'content_management', weight: 10},
+            {value: 'publishing_software', weight: 8},
+            {value: 'newsletter_tool', weight: 10},
+            {value: 'membership_site', weight: 8},
+            {value: 'headless_cms', weight: 7},
+            {value: 'open_source_blog', weight: 5}
+        ];
         
         // Weighted distributions based on production data
         this.memberStatusWeights = [
@@ -497,6 +550,39 @@ class AnalyticsEventGenerator {
     randomChoice(array) {
         return array[Math.floor(Math.random() * array.length)];
     }
+
+    /**
+     * Generate UTM parameters for an event
+     * Returns null for ~50% of events (organic/direct traffic without UTM)
+     */
+    generateUtmParameters() {
+        // 50% of events have no UTM parameters (organic/direct traffic)
+        if (Math.random() < 0.5) {
+            return null;
+        }
+
+        const utmParams = {
+            utm_source: this.weightedChoice(this.utmSources),
+            utm_medium: this.weightedChoice(this.utmMediums)
+        };
+
+        // 80% of UTM events include a campaign
+        if (Math.random() < 0.8) {
+            utmParams.utm_campaign = this.weightedChoice(this.utmCampaigns);
+        }
+
+        // 40% of UTM events include content
+        if (Math.random() < 0.4) {
+            utmParams.utm_content = this.weightedChoice(this.utmContents);
+        }
+
+        // 30% of UTM events include term (mainly for paid search)
+        if (Math.random() < 0.3 && utmParams.utm_medium === 'cpc') {
+            utmParams.utm_term = this.weightedChoice(this.utmTerms);
+        }
+
+        return utmParams;
+    }
     
     /**
      * Format timestamp to match the schema format
@@ -533,7 +619,19 @@ class AnalyticsEventGenerator {
         
         // Generate referrerSource for meta field
         const referrerSource = this.referrerSourceMap[referrer] || referrer;
-        
+
+        // Generate UTM parameters
+        const utmParams = this.generateUtmParameters();
+
+        // Build href with UTM parameters if present
+        let href = `${this.baseUrl}${content.pathname}`;
+        if (utmParams) {
+            const utmQueryString = Object.entries(utmParams)
+                .map(([key, value]) => `${key}=${encodeURIComponent(value)}`)
+                .join('&');
+            href = `${href}?${utmQueryString}`;
+        }
+
         const payload = {
             site_uuid: this.siteUuid,
             member_uuid: memberUuid,
@@ -545,11 +643,16 @@ class AnalyticsEventGenerator {
             location: this.weightedChoice(this.locationWeights),
             referrer: referrer,
             pathname: content.pathname,
-            href: `${this.baseUrl}${content.pathname}`,
+            href: href,
             meta: {
                 referrerSource: referrerSource
             }
         };
+
+        // Add UTM parameters to payload if present
+        if (utmParams) {
+            Object.assign(payload, utmParams);
+        }
         
         return {
             timestamp: this.formatTimestamp(timestamp),
@@ -591,6 +694,7 @@ class AnalyticsEventGenerator {
         console.log(`📈 Traffic pattern: Moderate growth over time with realistic seasonal patterns`);
         console.log(`⏰ Includes realistic daily/weekly patterns (weekdays > weekends, business hours > nights)`);
         console.log(`🔗 Using production-based referrer patterns (Google, Reddit, Bluesky, newsletters, etc.)`);
+        console.log(`🎯 ~50% of events include UTM tracking parameters (source, medium, campaign, content, term)`);
         
         for (let i = 0; i < numEvents; i++) {
             events.push(this.generateEvent(i, numEvents));

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

@@ -11,30 +11,6 @@
     {"date":"2100-01-06","visits":2,"pageviews":2,"bounce_rate":1,"avg_session_sec":0}
     {"date":"2100-01-07","visits":2,"pageviews":2,"bounce_rate":1,"avg_session_sec":0}
 
-- name: Filtered by browser - Chrome
-  description: Filtered by browser - Chrome
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&browser=chrome
-  expected_result: |
-    {"date":"2100-01-01","visits":1,"pageviews":2,"bounce_rate":0,"avg_session_sec":1111}
-    {"date":"2100-01-02","visits":0,"pageviews":0,"bounce_rate":0,"avg_session_sec":0}
-    {"date":"2100-01-03","visits":1,"pageviews":3,"bounce_rate":0,"avg_session_sec":1115}
-    {"date":"2100-01-04","visits":3,"pageviews":7,"bounce_rate":0.33,"avg_session_sec":572}
-    {"date":"2100-01-05","visits":1,"pageviews":3,"bounce_rate":0,"avg_session_sec":493}
-    {"date":"2100-01-06","visits":1,"pageviews":1,"bounce_rate":1,"avg_session_sec":0}
-    {"date":"2100-01-07","visits":0,"pageviews":0,"bounce_rate":0,"avg_session_sec":0}
-
-- name: Filtered by device - desktop
-  description: Filtered by device - desktop
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&device=desktop
-  expected_result: |
-    {"date":"2100-01-01","visits":2,"pageviews":4,"bounce_rate":0,"avg_session_sec":870.5}
-    {"date":"2100-01-02","visits":1,"pageviews":3,"bounce_rate":0,"avg_session_sec":1027}
-    {"date":"2100-01-03","visits":3,"pageviews":7,"bounce_rate":0,"avg_session_sec":3333}
-    {"date":"2100-01-04","visits":3,"pageviews":7,"bounce_rate":0.33,"avg_session_sec":572}
-    {"date":"2100-01-05","visits":2,"pageviews":5,"bounce_rate":0,"avg_session_sec":308}
-    {"date":"2100-01-06","visits":2,"pageviews":2,"bounce_rate":1,"avg_session_sec":0}
-    {"date":"2100-01-07","visits":2,"pageviews":2,"bounce_rate":1,"avg_session_sec":0}
-
 - name: Filtered by location - UK
   description: Filtered by location - UK
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&location=GB
@@ -47,18 +23,6 @@
     {"date":"2100-01-06","visits":1,"pageviews":1,"bounce_rate":1,"avg_session_sec":0}
     {"date":"2100-01-07","visits":0,"pageviews":0,"bounce_rate":0,"avg_session_sec":0}
 
-- name: Filtered by OS - Windows
-  description: Filtered by OS - Windows
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&os=windows
-  expected_result: |
-    {"date":"2100-01-01","visits":2,"pageviews":4,"bounce_rate":0,"avg_session_sec":870.5}
-    {"date":"2100-01-02","visits":1,"pageviews":3,"bounce_rate":0,"avg_session_sec":1027}
-    {"date":"2100-01-03","visits":3,"pageviews":7,"bounce_rate":0,"avg_session_sec":3333}
-    {"date":"2100-01-04","visits":3,"pageviews":7,"bounce_rate":0.33,"avg_session_sec":572}
-    {"date":"2100-01-05","visits":2,"pageviews":5,"bounce_rate":0,"avg_session_sec":308}
-    {"date":"2100-01-06","visits":1,"pageviews":1,"bounce_rate":1,"avg_session_sec":0}
-    {"date":"2100-01-07","visits":2,"pageviews":2,"bounce_rate":1,"avg_session_sec":0}
-
 - name: Filtered by pathname - /about/
   description: Filtered by pathname - /about/
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&pathname=%2Fabout%2F

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

@@ -9,40 +9,12 @@
     {"location":"ES","visits":2}
     {"location":"DE","visits":1}
 
-- name: Filtered by browser - Chrome
-  description: Filtered by browser - Chrome
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&browser=chrome
-  expected_result: |
-    {"location":"GB","visits":5}
-    {"location":"DE","visits":1}
-    {"location":"ES","visits":1}
-
-- name: Filtered by device - desktop
-  description: Filtered by device - desktop
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&device=desktop
-  expected_result: |
-    {"location":"GB","visits":7}
-    {"location":"US","visits":3}
-    {"location":"FR","visits":2}
-    {"location":"ES","visits":2}
-    {"location":"DE","visits":1}
-
 - name: Filtered by location - UK
   description: Filtered by location - UK
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&location=GB
   expected_result: |
     {"location":"GB","visits":8}
 
-- name: Filtered by OS - Windows
-  description: Filtered by OS - Windows
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&os=windows
-  expected_result: |
-    {"location":"GB","visits":7}
-    {"location":"US","visits":3}
-    {"location":"ES","visits":2}
-    {"location":"FR","visits":1}
-    {"location":"DE","visits":1}
-
 - name: Filtered by pathname - /about/
   description: Filtered by pathname - /about/
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&pathname=%2Fabout%2F
@@ -98,8 +70,7 @@
 
 - name: Test with multiple filters combined
   description: Test with multiple filters combined
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&device=desktop&browser=firefox
+  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&source=bing.com&pathname=%2Fabout%2F
   expected_result: |
-    {"location":"US","visits":3}
-    {"location":"FR","visits":1}
+    {"location":"DE","visits":1}
     {"location":"GB","visits":1}

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

@@ -8,23 +8,6 @@
     {"post_uuid":"","pathname":"\/","visits":7}
     {"post_uuid":"06b1b0c9-fb53-4a15-a060-3db3fde7b1dd","pathname":"\/blog\/hello-world\/","visits":1}
 
-- name: Filtered by browser - Chrome
-  description: Filtered by browser - Chrome
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&browser=chrome
-  expected_result: |
-    {"post_uuid":"6b8635fb-292f-4422-9fe4-d76cfab2ba31","pathname":"\/blog\/hello-world\/","visits":6}
-    {"post_uuid":"06b1b0c9-fb53-4a15-a060-3db3fde7b1fc","pathname":"\/about\/","visits":3}
-    {"post_uuid":"","pathname":"\/","visits":3}
-
-- name: Filtered by device - desktop
-  description: Filtered by device - desktop
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&device=desktop
-  expected_result: |
-    {"post_uuid":"06b1b0c9-fb53-4a15-a060-3db3fde7b1fc","pathname":"\/about\/","visits":8}
-    {"post_uuid":"6b8635fb-292f-4422-9fe4-d76cfab2ba31","pathname":"\/blog\/hello-world\/","visits":8}
-    {"post_uuid":"","pathname":"\/","visits":7}
-    {"post_uuid":"06b1b0c9-fb53-4a15-a060-3db3fde7b1dd","pathname":"\/blog\/hello-world\/","visits":1}
-
 - name: Filtered by location - UK
   description: Filtered by location - UK
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&location=GB
@@ -33,15 +16,6 @@
     {"post_uuid":"06b1b0c9-fb53-4a15-a060-3db3fde7b1fc","pathname":"\/about\/","visits":4}
     {"post_uuid":"","pathname":"\/","visits":4}
 
-- name: Filtered by OS - Windows
-  description: Filtered by OS - Windows
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&os=windows
-  expected_result: |
-    {"post_uuid":"6b8635fb-292f-4422-9fe4-d76cfab2ba31","pathname":"\/blog\/hello-world\/","visits":8}
-    {"post_uuid":"06b1b0c9-fb53-4a15-a060-3db3fde7b1fc","pathname":"\/about\/","visits":7}
-    {"post_uuid":"","pathname":"\/","visits":7}
-    {"post_uuid":"06b1b0c9-fb53-4a15-a060-3db3fde7b1dd","pathname":"\/blog\/hello-world\/","visits":1}
-
 - name: Filtered by pathname - /about/
   description: Filtered by pathname - /about/
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&pathname=%2Fabout%2F
@@ -90,12 +64,9 @@
 
 - name: Test with multiple filters combined
   description: Test with multiple filters combined
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&device=desktop&browser=firefox
+  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&source=bing.com&pathname=%2Fabout%2F
   expected_result: |
-    {"post_uuid":"","pathname":"\/","visits":3}
     {"post_uuid":"06b1b0c9-fb53-4a15-a060-3db3fde7b1fc","pathname":"\/about\/","visits":2}
-    {"post_uuid":"6b8635fb-292f-4422-9fe4-d76cfab2ba31","pathname":"\/blog\/hello-world\/","visits":1}
-    {"post_uuid":"06b1b0c9-fb53-4a15-a060-3db3fde7b1dd","pathname":"\/blog\/hello-world\/","visits":1}
 
 - name: Test with post_type - post
   description: Test with post_type - post

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

@@ -13,28 +13,6 @@
     {"source":"petty-queen.com","visits":1}
     {"source":"my-ghost-site.com","visits":1}
 
-- name: Filtered by browser - Chrome
-  description: Filtered by browser - Chrome
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&browser=chrome
-  expected_result: |
-    {"source":"","visits":4}
-    {"source":"bing.com","visits":1}
-    {"source":"search.yahoo.com","visits":1}
-    {"source":"baidu.com","visits":1}
-
-- name: Filtered by device - desktop
-  description: Filtered by device - desktop
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&device=desktop
-  expected_result: |
-    {"source":"","visits":6}
-    {"source":"bing.com","visits":2}
-    {"source":"search.yahoo.com","visits":2}
-    {"source":"google.com","visits":1}
-    {"source":"baidu.com","visits":1}
-    {"source":"wilted-tick.com","visits":1}
-    {"source":"duckduckgo.com","visits":1}
-    {"source":"my-ghost-site.com","visits":1}
-
 - name: Filtered by location - UK
   description: Filtered by location - UK
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&location=GB
@@ -46,19 +24,6 @@
     {"source":"baidu.com","visits":1}
     {"source":"petty-queen.com","visits":1}
 
-- name: Filtered by OS - Windows
-  description: Filtered by OS - Windows
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&os=windows
-  expected_result: |
-    {"source":"","visits":5}
-    {"source":"bing.com","visits":2}
-    {"source":"search.yahoo.com","visits":2}
-    {"source":"google.com","visits":1}
-    {"source":"baidu.com","visits":1}
-    {"source":"wilted-tick.com","visits":1}
-    {"source":"duckduckgo.com","visits":1}
-    {"source":"my-ghost-site.com","visits":1}
-
 - name: Filtered by pathname - /about/
   description: Filtered by pathname - /about/
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&pathname=%2Fabout%2F
@@ -118,13 +83,9 @@
 
 - name: Test with multiple filters combined
   description: Test with multiple filters combined
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&device=desktop&browser=firefox
+  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&source=bing.com&pathname=%2Fabout%2F
   expected_result: |
-    {"source":"google.com","visits":1}
-    {"source":"search.yahoo.com","visits":1}
-    {"source":"wilted-tick.com","visits":1}
-    {"source":"duckduckgo.com","visits":1}
-    {"source":"my-ghost-site.com","visits":1}
+    {"source":"bing.com","visits":2}
 
 - name: Filtered by utm_source - google
   description: Filtered by utm_source - google

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

@@ -10,25 +10,6 @@
     {"utm_campaign":"retention_q4","visits":1}
     {"utm_campaign":"newsletter_weekly","visits":1}
 
-- name: Filtered by browser - Chrome
-  description: Filtered by browser - Chrome
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&browser=chrome
-  expected_result: |
-    {"utm_campaign":"brand_awareness","visits":2}
-    {"utm_campaign":"summer_sale_2024","visits":1}
-    {"utm_campaign":"retention_q4","visits":1}
-
-- name: Filtered by device - desktop
-  description: Filtered by device - desktop
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&device=desktop
-  expected_result: |
-    {"utm_campaign":"brand_awareness","visits":2}
-    {"utm_campaign":"holiday_promo","visits":2}
-    {"utm_campaign":"product_launch","visits":2}
-    {"utm_campaign":"summer_sale_2024","visits":1}
-    {"utm_campaign":"retention_q4","visits":1}
-    {"utm_campaign":"newsletter_weekly","visits":1}
-
 - name: Filtered by location - UK
   description: Filtered by location - UK
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&location=GB
@@ -38,17 +19,6 @@
     {"utm_campaign":"product_launch","visits":1}
     {"utm_campaign":"newsletter_weekly","visits":1}
 
-- name: Filtered by OS - Windows
-  description: Filtered by OS - Windows
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&os=windows
-  expected_result: |
-    {"utm_campaign":"brand_awareness","visits":2}
-    {"utm_campaign":"holiday_promo","visits":2}
-    {"utm_campaign":"product_launch","visits":2}
-    {"utm_campaign":"summer_sale_2024","visits":1}
-    {"utm_campaign":"retention_q4","visits":1}
-    {"utm_campaign":"newsletter_weekly","visits":1}
-
 - name: Filtered by pathname - /about/
   description: Filtered by pathname - /about/
   parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&pathname=%2Fabout%2F
@@ -103,7 +73,7 @@
 
 - name: Test with multiple filters combined
   description: Test with multiple filters combined
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&device=desktop&browser=firefox
+  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&source=bing.com&pathname=%2Fabout%2F
   expected_result: |
-    {"utm_campaign":"holiday_promo","visits":2}
-    {"utm_campaign":"product_launch","visits":2}
+    {"utm_campaign":"retention_q4","visits":1}
+    {"utm_campaign":"newsletter_weekly","visits":1}