ghost 6.8.0 → 6.9.0

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

@@ -1,72 +0,0 @@
-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');
-
-let content;
-
-const buildContentResponse = (ext, buf) => {
-    content = {
-        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
-    };
-
-    return content;
-};
-
-// ### serveFavicon Middleware
-// Handles requests to favicon.png and favicon.ico
-function serveFavicon() {
-    let filePath;
-
-    return function serveFaviconMiddleware(req, res, next) {
-        if (req.path.match(/^\/favicon\.(ico|png|jpe?g)/i)) {
-            // 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
-            filePath = blogIcon.getIconPath();
-
-            let 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());
-            } else {
-                originalExtension = path.extname(filePath).toLowerCase();
-
-                // 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);
-                    }
-
-                    content = buildContentResponse('x-icon', buf);
-
-                    res.writeHead(200, content.headers);
-                    res.end(content.body);
-                });
-            }
-        } else {
-            return next();
-        }
-    };
-}
-
-module.exports = serveFavicon;

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

@@ -1,54 +0,0 @@
-TOKEN "stats_page" READ
-TOKEN "axis" READ
-
-NODE _top_browsers_0
-SQL >
-
-    %
-        select
-            browser,
-            uniqExact(session_id) as visits
-        from _mv_hits h
-        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 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(
-                        {{ Array(member_status, "'undefined', 'free', 'paid'", description="Member status to filter on", required=False) }}
-                        || if('paid' IN {{ Array(member_status) }}, ['comped'], [])
-                    )
-                )
-            {% 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 %}
-            -- added source filter back
-            {% 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 %}
-        group by browser
-        order by visits desc
-        limit {{ Int32(skip, 0) }},{{ Int32(limit, 50) }}
-
-TYPE ENDPOINT

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

@@ -1,53 +0,0 @@
-TOKEN "stats_page" READ
-TOKEN "axis" READ
-
-NODE _top_devices_0
-SQL >
-
-    %
-        select
-            device,
-            uniqExact(session_id) as visits
-        from _mv_hits h
-        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 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(
-                        {{ Array(member_status, "'undefined', 'free', 'paid'", description="Member status to filter on", required=False) }}
-                        || if('paid' IN {{ Array(member_status) }}, ['comped'], [])
-                    )
-                )
-            {% 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 %}
-            {% if defined(post_uuid) %} and post_uuid = {{ String(post_uuid, description="Post UUID to filter on", required=False) }} {% end %}
-        group by device
-        order by visits desc
-        limit {{ Int32(skip, 0) }},{{ Int32(limit, 50) }}
-
-TYPE ENDPOINT

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

@@ -1,53 +0,0 @@
-TOKEN "stats_page" READ
-TOKEN "axis" READ
-
-NODE _top_os_0
-SQL >
-
-    %
-        select
-            os,
-            uniqExact(session_id) as visits
-        from _mv_hits h
-        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 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 -1 year)
-            {% 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(
-                        {{ Array(member_status, "'undefined', 'free', 'paid'", description="Member status to filter on", required=False) }}
-                        || if('paid' IN {{ Array(member_status) }}, ['comped'], [])
-                    )
-                )
-            {% 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 %}
-            {% if defined(post_uuid) %} and post_uuid = {{ String(post_uuid, description="Post UUID to filter on", required=False) }} {% end %}
-        group by os
-        order by visits desc
-        limit {{ Int32(skip, 0) }},{{ Int32(limit, 50) }}
-
-TYPE ENDPOINT

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

@@ -1,98 +0,0 @@
-
-- name: Date range
-  description: All fixture data
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC
-  expected_result: |
-    {"browser":"chrome","visits":7}
-    {"browser":"firefox","visits":5}
-    {"browser":"ie","visits":2}
-    {"browser":"safari","visits":1}
-    {"browser":"Unknown","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: |
-    {"browser":"chrome","visits":7}
-
-- 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: |
-    {"browser":"chrome","visits":7}
-    {"browser":"firefox","visits":5}
-    {"browser":"ie","visits":2}
-    {"browser":"safari","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: |
-    {"browser":"chrome","visits":5}
-    {"browser":"firefox","visits":1}
-    {"browser":"Unknown","visits":1}
-    {"browser":"ie","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: |
-    {"browser":"chrome","visits":7}
-    {"browser":"firefox","visits":5}
-    {"browser":"ie","visits":2}
-
-- 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
-  expected_result: |
-    {"browser":"chrome","visits":3}
-    {"browser":"firefox","visits":2}
-    {"browser":"ie","visits":2}
-    {"browser":"safari","visits":1}
-
-- name: Filtered by post_uuid - 06b1b0c9-fb53-4a15-a060-3db3fde7b1fc (/about/)
-  description: Filtered by post_uuid - 06b1b0c9-fb53-4a15-a060-3db3fde7b1fc (/about/)
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&post_uuid=06b1b0c9-fb53-4a15-a060-3db3fde7b1fc
-  expected_result: |
-    {"browser":"chrome","visits":3}
-    {"browser":"firefox","visits":2}
-    {"browser":"ie","visits":2}
-    {"browser":"safari","visits":1}
-
-- name: Filtered by source - bing.com
-  description: Filtered by source - bing.com
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&source=bing.com
-  expected_result: |
-    {"browser":"chrome","visits":1}
-    {"browser":"ie","visits":1}
-
-- name: Filtered by member status - paid
-  description: Filtered by member status - paid
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&member_status=paid
-  expected_result: |
-    {"browser":"firefox","visits":2}
-    {"browser":"chrome","visits":2}
-    {"browser":"ie","visits":1}
-
-- name: Filtered by member status - undefined
-  description: Filtered by member status - undefined
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&member_status=undefined
-  expected_result: |
-    {"browser":"chrome","visits":3}
-    {"browser":"firefox","visits":2}
-    {"browser":"Unknown","visits":1}
-
-- name: Filtered by timezone - America/Los_Angeles
-  description: Filtered by timezone - America/Los_Angeles
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=America/Los_Angeles
-  expected_result: |
-    {"browser":"chrome","visits":6}
-    {"browser":"firefox","visits":5}
-    {"browser":"safari","visits":1}
-    {"browser":"ie","visits":1}
-
-- 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
-  expected_result: |
-    {"browser":"firefox","visits":5}

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

@@ -1,75 +0,0 @@
-
-- name: Date range
-  description: All fixture data
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC
-  expected_result: |
-    {"device":"desktop","visits":15}
-    {"device":"bot","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: |
-    {"device":"desktop","visits":7}
-
-- 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: |
-    {"device":"desktop","visits":15}
-
-- 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: |
-    {"device":"desktop","visits":7}
-    {"device":"bot","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: |
-    {"device":"desktop","visits":14}
-
-- 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
-  expected_result: |
-    {"device":"desktop","visits":8}
-
-- name: Filtered by post_uuid - 06b1b0c9-fb53-4a15-a060-3db3fde7b1fc (/about/)
-  description: Filtered by post_uuid - 06b1b0c9-fb53-4a15-a060-3db3fde7b1fc (/about/)
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&post_uuid=06b1b0c9-fb53-4a15-a060-3db3fde7b1fc
-  expected_result: |
-    {"device":"desktop","visits":8}
-
-- name: Filtered by source - bing.com
-  description: Filtered by source - bing.com
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&source=bing.com
-  expected_result: |
-    {"device":"desktop","visits":2}
-
-- name: Filtered by member status - paid
-  description: Filtered by member status - paid
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&member_status=paid
-  expected_result: |
-    {"device":"desktop","visits":5}
-
-- name: Filtered by member status - undefined
-  description: Filtered by member status - undefined
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&member_status=undefined
-  expected_result: |
-    {"device":"desktop","visits":5}
-    {"device":"bot","visits":1}
-
-- name: Filtered by timezone - America/Los_Angeles
-  description: Filtered by timezone - America/Los_Angeles
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=America/Los_Angeles
-  expected_result: |
-    {"device":"desktop","visits":13}
-
-- 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
-  expected_result: |
-    {"device":"desktop","visits":5}

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

@@ -1,80 +0,0 @@
-
-- name: Date range
-  description: All fixture data
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC
-  expected_result: |
-    {"os":"windows","visits":14}
-    {"os":"Unknown","visits":1}
-    {"os":"macos","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: |
-    {"os":"windows","visits":7}
-
-- 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: |
-    {"os":"windows","visits":14}
-    {"os":"macos","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: |
-    {"os":"windows","visits":7}
-    {"os":"Unknown","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: |
-    {"os":"windows","visits":14}
-
-- 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
-  expected_result: |
-    {"os":"windows","visits":7}
-    {"os":"macos","visits":1}
-
-- name: Filtered by post_uuid - 06b1b0c9-fb53-4a15-a060-3db3fde7b1fc (/about/)
-  description: Filtered by post_uuid - 06b1b0c9-fb53-4a15-a060-3db3fde7b1fc (/about/)
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&post_uuid=06b1b0c9-fb53-4a15-a060-3db3fde7b1fc
-  expected_result: |
-    {"os":"windows","visits":7}
-    {"os":"macos","visits":1}
-
-- name: Filtered by source - bing.com
-  description: Filtered by source - bing.com
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&source=bing.com
-  expected_result: |
-    {"os":"windows","visits":2}
-
-- name: Filtered by member status - paid
-  description: Filtered by member status - paid
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&member_status=paid
-  expected_result: |
-    {"os":"windows","visits":5}
-
-- name: Filtered by member status - undefined
-  description: Filtered by member status - undefined
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=Etc/UTC&member_status=undefined
-  expected_result: |
-    {"os":"windows","visits":5}
-    {"os":"Unknown","visits":1}
-
-- name: Filtered by timezone - America/Los_Angeles
-  description: Filtered by timezone - America/Los_Angeles
-  parameters: site_uuid=mock_site_uuid&date_from=2100-01-01&date_to=2100-01-07&timezone=America/Los_Angeles
-  expected_result: |
-    {"os":"windows","visits":12}
-    {"os":"macos","visits":1}
-
-- 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
-  expected_result: |
-    {"os":"windows","visits":5}