From a7d6c982dfe25301ee47b23254bb05635d27e502 Mon Sep 17 00:00:00 2001 From: Pascale Beier Date: Mon, 16 Nov 2026 17:34:38 +0100 Subject: [PATCH 1/2] fix(analytics): exclude self-referrals and preserve bounce counts --- database/analytics_filters.go | 5 +- database/analytics_filters_test.go | 1 + ..._11_16_000000_normalize_self_referrers.sql | 13 ++ .../tenant/0018_normalize_self_referrers.sql | 13 ++ database/store_analytics_breakdown.go | 2 +- database/store_analytics_events.go | 4 +- database/store_analytics_filters.go | 4 +- database/store_analytics_imported.go | 6 +- .../store_analytics_imported_bounce_test.go | 66 ++++++ database/store_ecommerce.go | 2 +- database/store_referrer_test.go | 198 ++++++++++++++++++ 11 files changed, 305 insertions(+), 9 deletions(-) create mode 100644 database/migrations/2026_11_16_000000_normalize_self_referrers.sql create mode 100644 database/migrations/tenant/0018_normalize_self_referrers.sql create mode 100644 database/store_analytics_imported_bounce_test.go create mode 100644 database/store_referrer_test.go diff --git a/database/analytics_filters.go b/database/analytics_filters.go index bbae94b68..f2c665458 100644 --- a/database/analytics_filters.go +++ b/database/analytics_filters.go @@ -49,7 +49,7 @@ func buildHitFilter(filterType, filterValue, alias string) (string, []any) { if isDirectReferrer(filterValue) { normalized = "(Direct)" } - expr := fmt.Sprintf("hk_referrer(%sreferrer)", prefix) + expr := fmt.Sprintf("hk_external_referrer(%sreferrer, %ssite_id)", prefix, prefix) return " AND " + expr + " = ?", []any{normalized} case "referrer_host": expr := referrerHostExpr(prefix) @@ -162,8 +162,9 @@ func normalizeReferrerHostFilter(value string) string { func referrerHostExpr(prefix string) string { return fmt.Sprintf(`CASE + WHEN hk_external_referrer(%sreferrer, %ssite_id) IS NULL THEN NULL WHEN %sreferrer IS NULL OR NULLIF(TRIM(%sreferrer), '') IS NULL THEN '(Direct)' WHEN lower(%sreferrer) LIKE 'http%%' THEN regexp_replace(regexp_extract(lower(%sreferrer), 'https?://([^/:?#]+)', 1), '^www\\.', '') ELSE regexp_replace(lower(TRIM(%sreferrer)), '^www\\.', '') - END`, prefix, prefix, prefix, prefix, prefix) + END`, prefix, prefix, prefix, prefix, prefix, prefix, prefix) } diff --git a/database/analytics_filters_test.go b/database/analytics_filters_test.go index e54a7e5c7..d4feaec30 100644 --- a/database/analytics_filters_test.go +++ b/database/analytics_filters_test.go @@ -56,6 +56,7 @@ func TestBuildHitFilter(t *testing.T) { field: "referrer_host", value: "www.Google.com", wantClause: ` AND CASE + WHEN hk_external_referrer(h.referrer, h.site_id) IS NULL THEN NULL WHEN h.referrer IS NULL OR NULLIF(TRIM(h.referrer), '') IS NULL THEN '(Direct)' WHEN lower(h.referrer) LIKE 'http%' THEN regexp_replace(regexp_extract(lower(h.referrer), 'https?://([^/:?#]+)', 1), '^www\\.', '') ELSE regexp_replace(lower(TRIM(h.referrer)), '^www\\.', '') diff --git a/database/migrations/2026_11_16_000000_normalize_self_referrers.sql b/database/migrations/2026_11_16_000000_normalize_self_referrers.sql new file mode 100644 index 000000000..b2491a6a8 --- /dev/null +++ b/database/migrations/2026_11_16_000000_normalize_self_referrers.sql @@ -0,0 +1,13 @@ +-- Classify internal navigation at query time, including stored/imported history. +CREATE OR REPLACE MACRO hk_external_referrer(ref, ref_site_id) AS ( + CASE + WHEN regexp_replace( + regexp_extract(lower(trim(ref)), '^(?:https?://|//)?([^/:?#]+)(?::[0-9]+)?(?:[/?#]|$)', 1), + '^www\.', '' + ) = ( + SELECT regexp_replace(lower(trim(domain)), '^www\.', '') + FROM sites WHERE id = ref_site_id + ) THEN NULL + ELSE hk_referrer(ref) + END +); diff --git a/database/migrations/tenant/0018_normalize_self_referrers.sql b/database/migrations/tenant/0018_normalize_self_referrers.sql new file mode 100644 index 000000000..b2491a6a8 --- /dev/null +++ b/database/migrations/tenant/0018_normalize_self_referrers.sql @@ -0,0 +1,13 @@ +-- Classify internal navigation at query time, including stored/imported history. +CREATE OR REPLACE MACRO hk_external_referrer(ref, ref_site_id) AS ( + CASE + WHEN regexp_replace( + regexp_extract(lower(trim(ref)), '^(?:https?://|//)?([^/:?#]+)(?::[0-9]+)?(?:[/?#]|$)', 1), + '^www\.', '' + ) = ( + SELECT regexp_replace(lower(trim(domain)), '^www\.', '') + FROM sites WHERE id = ref_site_id + ) THEN NULL + ELSE hk_referrer(ref) + END +); diff --git a/database/store_analytics_breakdown.go b/database/store_analytics_breakdown.go index cdf258a91..99e0d3e3e 100644 --- a/database/store_analytics_breakdown.go +++ b/database/store_analytics_breakdown.go @@ -14,7 +14,7 @@ import ( // using the same classifications as the site overview's top lists. var breakdownDimensions = map[string]string{ "page": "h.path", - "referrer": "hk_referrer(h.referrer)", + "referrer": "hk_external_referrer(h.referrer, h.site_id)", "device": "hk_device(h.viewport_width)", "country": "hk_country(h.country_code)", "city": "COALESCE(NULLIF(TRIM(h.city), ''), '(Unknown)')", diff --git a/database/store_analytics_events.go b/database/store_analytics_events.go index 02d1cb91e..a7f3e8012 100644 --- a/database/store_analytics_events.go +++ b/database/store_analytics_events.go @@ -247,7 +247,7 @@ func (s *Store) GetEventAudience(ctx context.Context, params api.EventAudiencePa base AS ( SELECT h.path AS path, - hk_referrer(h.referrer) AS referrer, + hk_external_referrer(h.referrer, h.site_id) AS referrer, hk_device(h.viewport_width) AS device, hk_country(h.country_code) AS country, COALESCE(NULLIF(TRIM(h.city), ''), '(Unknown)') AS city, @@ -278,6 +278,7 @@ func (s *Store) GetEventAudience(ctx context.Context, params api.EventAudiencePa SELECT dim, name, val, ROW_NUMBER() OVER (PARTITION BY dim ORDER BY val DESC) AS rn FROM agg + WHERE name IS NOT NULL ) SELECT dim, name, val FROM ranked WHERE rn <= 10 ORDER BY dim, val DESC `, propClause, filterSQL) @@ -424,6 +425,7 @@ func (s *Store) getImportedEventAudienceDimensions(ctx context.Context, params a FROM imported_event_dimensions_daily WHERE site_id = ? AND date >= CAST(? AS DATE) AND date <= CAST(? AS DATE) AND event_name = ? AND dimension IN ('path', 'referrer', 'device', 'country', 'city', 'provider', 'asn') + AND (dimension <> 'referrer' OR hk_external_referrer(name, site_id) IS NOT NULL) GROUP BY dimension, name UNION ALL SELECT 'path' AS dimension, path AS name, SUM(visitors) AS val diff --git a/database/store_analytics_filters.go b/database/store_analytics_filters.go index fd2459fc6..d83a02506 100644 --- a/database/store_analytics_filters.go +++ b/database/store_analytics_filters.go @@ -287,9 +287,9 @@ const agentsCTE = `agents AS ( const referrersCTE = `referrers AS ( SELECT referrer, - hk_referrer(referrer) AS referrer_name, + hk_external_referrer(referrer, site_id) AS referrer_name, hk_ai_source(referrer) AS ai_source - FROM (SELECT DISTINCT referrer FROM scoped) + FROM (SELECT DISTINCT referrer, site_id FROM scoped) )` // queryAIKpis aggregates the AI traffic KPIs for one window. It mirrors the diff --git a/database/store_analytics_imported.go b/database/store_analytics_imported.go index 0d7d1abed..1765687e7 100644 --- a/database/store_analytics_imported.go +++ b/database/store_analytics_imported.go @@ -5,6 +5,7 @@ import ( "context" "database/sql" "fmt" + "math" "slices" "time" @@ -47,7 +48,7 @@ func (s *Store) augmentImportedSiteStats(ctx context.Context, params api.Analyti importedDuration := float64(sqlNullInt64Value(duration)) nativePageviews := stats.TotalPageviews nativeSessions := stats.UniqueSessions - nativeBounces := int((stats.BounceRate / 100) * float64(nativeSessions)) + nativeBounces := int(math.Round((stats.BounceRate / 100) * float64(nativeSessions))) nativeDuration := stats.AvgSessionDuration * float64(nativeSessions) stats.TotalPageviews += importedPageviews @@ -96,7 +97,7 @@ func (s *Store) augmentImportedSiteOverviewStats(ctx context.Context, params api importedVisits := int(sqlNullInt64Value(visits)) importedBounces := int(sqlNullInt64Value(bounces)) nativeSessions := stats.UniqueSessions - nativeBounces := int((stats.BounceRate / 100) * float64(nativeSessions)) + nativeBounces := int(math.Round((stats.BounceRate / 100) * float64(nativeSessions))) stats.TotalPageviews += importedPageviews stats.UniqueSessions += importedVisits @@ -249,6 +250,7 @@ func (s *Store) mergeImportedTopLists(ctx context.Context, params api.AnalyticsP SELECT dimension, name, SUM(pageviews) AS val FROM imported_dimension_daily WHERE site_id = ? AND date >= CAST(? AS DATE) AND date <= CAST(? AS DATE) + AND (dimension <> 'source' OR hk_external_referrer(name, site_id) IS NOT NULL) AND dimension IN ( 'page', 'entry_page', 'exit_page', 'source', 'device', 'country', 'browser', 'operating_system', 'city', 'provider', 'asn', 'language', 'utm_campaign', 'utm_content', 'utm_medium', 'utm_source', 'utm_term' diff --git a/database/store_analytics_imported_bounce_test.go b/database/store_analytics_imported_bounce_test.go new file mode 100644 index 000000000..e690e6368 --- /dev/null +++ b/database/store_analytics_imported_bounce_test.go @@ -0,0 +1,66 @@ +package database + +import ( + "math" + "testing" + "time" + + "github.com/google/uuid" + + "hitkeep/api" + "hitkeep/importables" +) + +func TestImportedStatsPreserveNativeBounceCount(t *testing.T) { + store, userID := setupEventBreakdownStore(t) + ctx := t.Context() + site, err := store.CreateSite(ctx, userID, "bounce.example.test") + if err != nil { + t.Fatal(err) + } + at := time.Date(2026, 10, 1, 12, 0, 0, 0, time.UTC) + for _, duration := range []time.Duration{0, 20 * time.Second, 40 * time.Second} { + session := uuid.New() + if err := store.CreateHit(ctx, &api.Hit{SiteID: site.ID, SessionID: session, PageID: uuid.New(), Timestamp: at, Path: "/first"}); err != nil { + t.Fatal(err) + } + if duration > 0 { + if err := store.CreateHit(ctx, &api.Hit{SiteID: site.ID, SessionID: session, PageID: uuid.New(), Timestamp: at.Add(duration), Path: "/second"}); err != nil { + t.Fatal(err) + } + } + } + params := api.AnalyticsParams{SiteID: site.ID, Start: at.AddDate(0, 0, -1), End: at.AddDate(0, 0, 1)} + for _, imported := range []bool{false, true} { + if imported { + sink, err := NewImportedDataSink(ctx, store, site.ID, uuid.New()) + if err != nil { + t.Fatal(err) + } + if err := sink.PutTraffic(ctx, importables.TrafficRow{Date: at.AddDate(0, 0, -1), Visits: 1, Visitors: 1, Pageviews: 1, Bounces: 1, VisitDuration: 120, SourceFile: "visitors.csv"}); err != nil { + t.Fatal(err) + } + if err := sink.Flush(ctx); err != nil { + t.Fatal(err) + } + } + wantBounce, wantDuration := 100.0/3, 20.0 + if imported { + wantBounce, wantDuration = 50, 45 + } + stats, err := store.GetSiteStats(ctx, params) + if err != nil { + t.Fatal(err) + } + if math.Abs(stats.BounceRate-wantBounce) > 1e-9 || stats.AvgSessionDuration != wantDuration { + t.Errorf("imported=%t: bounce=%v duration=%v, want %v and %v", imported, stats.BounceRate, stats.AvgSessionDuration, wantBounce, wantDuration) + } + overview, err := store.GetSiteOverviewStats(ctx, params) + if err != nil { + t.Fatal(err) + } + if math.Abs(overview.BounceRate-wantBounce) > 1e-9 { + t.Errorf("imported=%t overview bounce=%v, want %v", imported, overview.BounceRate, wantBounce) + } + } +} diff --git a/database/store_ecommerce.go b/database/store_ecommerce.go index 228961acc..f6aba07d0 100644 --- a/database/store_ecommerce.go +++ b/database/store_ecommerce.go @@ -402,7 +402,7 @@ func (s *Store) listEcommerceEvents(ctx context.Context, params api.EcommercePar arg_min(COALESCE(NULLIF(TRIM(h.utm_source), ''), '(Unspecified)'), h.timestamp) AS utm_source, arg_min(COALESCE(NULLIF(TRIM(h.utm_medium), ''), '(Unspecified)'), h.timestamp) AS utm_medium, arg_min(COALESCE(NULLIF(TRIM(h.utm_campaign), ''), '(Unspecified)'), h.timestamp) AS utm_campaign, - arg_min(hk_referrer(h.referrer), h.timestamp) AS referrer, + arg_min(hk_external_referrer(h.referrer, h.site_id), h.timestamp) AS referrer, arg_min(hk_device(h.viewport_width), h.timestamp) AS device, arg_min(hk_country(h.country_code), h.timestamp) AS country, arg_min(COALESCE(NULLIF(TRIM(h.city), ''), '(Unknown)'), h.timestamp) AS city, diff --git a/database/store_referrer_test.go b/database/store_referrer_test.go new file mode 100644 index 000000000..95335d376 --- /dev/null +++ b/database/store_referrer_test.go @@ -0,0 +1,198 @@ +package database + +import ( + "testing" + "time" + + "github.com/google/uuid" + + "hitkeep/api" + "hitkeep/importables" +) + +func TestSelfReferrersExcludedFromReports(t *testing.T) { + for _, domain := range []string{"example.test", "www.example.test"} { + t.Run(domain, func(t *testing.T) { + store, userID := setupEventBreakdownStore(t) + ctx := t.Context() + site, err := store.CreateSite(ctx, userID, domain) + if err != nil { + t.Fatal(err) + } + at := time.Date(2026, 10, 1, 12, 0, 0, 0, time.UTC) + refs := []string{"https://example.test/first?x=1", "https://www.example.test/next", "https://WWW.EXAMPLE.TEST:8443/next?x=1#part", "//www.example.test/next", "https://news.example.test/article", "https://external.test:8443/article?q=1", "https://example.test.evil.test/path", "https://www.www.example.test/path", "https://external.test/?next=https://example.test/", ""} + for _, ref := range refs { + session := uuid.New() + hit := &api.Hit{SiteID: site.ID, SessionID: session, PageID: uuid.New(), Timestamp: at, Path: "/next", Referrer: new(ref)} + if err := store.CreateHit(ctx, hit); err != nil { + t.Fatal(err) + } + if err := store.CreateEvent(ctx, &api.Event{SiteID: site.ID, SessionID: session, Name: "signup", Timestamp: at}); err != nil { + t.Fatal(err) + } + } + params := api.AnalyticsParams{SiteID: site.ID, Start: at.Add(-time.Hour), End: at.Add(time.Hour)} + want := map[string]int{"news.example.test": 1, "external.test:8443": 1, "example.test.evil.test": 1, "www.www.example.test": 1, "external.test": 1, "(Direct)": 1} + check := func(got []api.MetricStat) { + t.Helper() + if len(got) != len(want) { + t.Errorf("referrers = %+v, want %v", got, want) + } + for _, metric := range got { + if want[metric.Name] != metric.Value { + t.Errorf("unexpected referrer %+v", metric) + } + } + } + stats, err := store.GetSiteStats(ctx, params) + if err != nil { + t.Fatal(err) + } + check(stats.TopReferrers) + if stats.TotalPageviews != len(refs) { + t.Errorf("pageviews = %d", stats.TotalPageviews) + } + breakdown, err := store.GetDimensionBreakdown(ctx, params, "referrer", 20) + if err != nil { + t.Fatal(err) + } + metrics := []api.MetricStat{} + for _, row := range breakdown { + metrics = append(metrics, api.MetricStat{Name: row.Name, Value: row.Pageviews}) + } + check(metrics) + audience, err := store.GetEventAudience(ctx, api.EventAudienceParams{SiteID: site.ID, Start: params.Start, End: params.End, EventName: "signup"}) + if err != nil { + t.Fatal(err) + } + check(audience.TopReferrers) + for _, filterType := range []string{"referrer", "referrer_host"} { + params.Filters = []api.Filter{{Type: filterType, Value: "www.example.test"}} + filtered, err := store.GetSiteStats(ctx, params) + if err != nil { + t.Fatal(err) + } + if filtered.TotalPageviews != 0 { + t.Errorf("self %s filter counted %d hits", filterType, filtered.TotalPageviews) + } + } + other, err := store.CreateSite(ctx, userID, "other.test") + if err != nil { + t.Fatal(err) + } + if err := store.CreateHit(ctx, &api.Hit{SiteID: other.ID, SessionID: uuid.New(), PageID: uuid.New(), Timestamp: at, Path: "/", Referrer: new("https://www.example.test/next")}); err != nil { + t.Fatal(err) + } + params.SiteID, params.Filters = other.ID, nil + isolated, err := store.GetSiteStats(ctx, params) + if err != nil { + t.Fatal(err) + } + if len(isolated.TopReferrers) != 1 || isolated.TopReferrers[0].Name != "www.example.test" { + t.Errorf("other site's external referral lost: %+v", isolated.TopReferrers) + } + + // Aggregate history has no per-hit hostname; use the configured site domain. + sink, err := NewImportedDataSink(ctx, store, site.ID, uuid.New()) + if err != nil { + t.Fatal(err) + } + for _, ref := range []string{"example.test", "www.example.test", "news.example.test", "external.test:8443"} { + if err := sink.PutDimension(ctx, importables.DimensionRow{Date: at, Dimension: "source", Name: ref, Pageviews: 3, SourceFile: "sources.csv"}); err != nil { + t.Fatal(err) + } + if err := sink.PutEventDimension(ctx, importables.EventDimensionRow{Date: at, EventName: "signup", Dimension: "referrer", Name: ref, Visitors: 3, SourceFile: "events.csv"}); err != nil { + t.Fatal(err) + } + } + if err := sink.Flush(ctx); err != nil { + t.Fatal(err) + } + params.SiteID, params.Start, params.End = site.ID, at.AddDate(0, 0, -1), at.AddDate(0, 0, 1) + history, err := store.GetSiteStats(ctx, params) + if err != nil { + t.Fatal(err) + } + want["news.example.test"], want["external.test:8443"] = 4, 4 + check(history.TopReferrers) + audience, err = store.GetEventAudience(ctx, api.EventAudienceParams{SiteID: site.ID, Start: params.Start, End: params.End, EventName: "signup"}) + if err != nil { + t.Fatal(err) + } + check(audience.TopReferrers) + var raw string + if err := store.db.QueryRowContext(ctx, "SELECT referrer FROM hits WHERE site_id = ? AND referrer = ? LIMIT 1", site.ID, refs[0]).Scan(&raw); err != nil { + t.Fatal(err) + } + if raw != refs[0] { + t.Fatal("stored historical referrer changed") + } + }) + } +} + +func TestTenantSelfReferrerClassification(t *testing.T) { + store := newTenantTestFixtureStore(t) + ctx := t.Context() + siteID := uuid.New() + if _, err := store.db.ExecContext(ctx, "INSERT INTO sites (id,domain) VALUES (?,?)", siteID, "www.example.test"); err != nil { + t.Fatal(err) + } + for _, tc := range []struct { + ref string + want *string + }{ + {"https://example.test/path?query=1", nil}, + {"https://www.example.test:8443/path", nil}, + {"example.test", nil}, + {"https://blog.example.test/path", new("blog.example.test")}, + {"https://external.test:8443/path?q=1", new("external.test:8443")}, + {"external.test/path?q=1", new("external.test/path?q=1")}, + {"https://example.test@external.test/path", new("example.test@external.test")}, + {"", new("(Direct)")}, + } { + var got *string + if err := store.db.QueryRowContext(ctx, "SELECT hk_external_referrer(?,?)", tc.ref, siteID).Scan(&got); err != nil { + t.Fatal(err) + } + if (got == nil) != (tc.want == nil) || (got != nil && tc.want != nil && *got != *tc.want) { + t.Errorf("referrer %q: got %v, want %v", tc.ref, got, tc.want) + } + } +} + +func TestEcommerceSourcesSkipInternalNavigation(t *testing.T) { + store, userID := setupEventBreakdownStore(t) + ctx := t.Context() + site, err := store.CreateSite(ctx, userID, "example.test") + if err != nil { + t.Fatal(err) + } + at := time.Date(2026, 10, 1, 12, 0, 0, 0, time.UTC) + for _, ref := range []string{"https://www.example.test/cart", "https://external.test:8443/landing?q=1"} { + session := uuid.New() + for i, pageRef := range []string{ref, "https://example.test/checkout"} { + if err := store.CreateHit(ctx, &api.Hit{SiteID: site.ID, SessionID: session, PageID: uuid.New(), Path: "/checkout", Timestamp: at.Add(time.Duration(i) * time.Minute), Referrer: new(pageRef)}); err != nil { + t.Fatal(err) + } + } + if err := store.CreateEvent(ctx, &api.Event{SiteID: site.ID, SessionID: session, Name: "purchase", Timestamp: at.Add(2 * time.Minute), Properties: map[string]any{"transaction_id": session.String(), "value": 10, "currency": "EUR"}}); err != nil { + t.Fatal(err) + } + } + sources, err := store.GetEcommerceSources(ctx, api.EcommerceParams{SiteID: site.ID, Start: at.Add(-time.Hour), End: at.Add(time.Hour)}) + if err != nil { + t.Fatal(err) + } + if len(sources) != 2 { + t.Fatalf("sources = %+v", sources) + } + for _, source := range sources { + if source.Referrer != "(Direct)" && source.Referrer != "external.test:8443" { + t.Errorf("internal navigation attributed as source: %+v", source) + } + if source.Revenue != 10 { + t.Errorf("revenue changed: %+v", source) + } + } +} From fd88f12d5937ce08219ffad3f8cc92f7f661f2d3 Mon Sep 17 00:00:00 2001 From: Pascale Beier Date: Mon, 16 Nov 2026 18:06:22 +0100 Subject: [PATCH 2/2] fix(database): make self-referrer macro restore independently --- .../2026_11_16_000000_normalize_self_referrers.sql | 5 ++++- database/migrations/tenant/0018_normalize_self_referrers.sql | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/database/migrations/2026_11_16_000000_normalize_self_referrers.sql b/database/migrations/2026_11_16_000000_normalize_self_referrers.sql index b2491a6a8..43f92b92e 100644 --- a/database/migrations/2026_11_16_000000_normalize_self_referrers.sql +++ b/database/migrations/2026_11_16_000000_normalize_self_referrers.sql @@ -8,6 +8,9 @@ CREATE OR REPLACE MACRO hk_external_referrer(ref, ref_site_id) AS ( SELECT regexp_replace(lower(trim(domain)), '^www\.', '') FROM sites WHERE id = ref_site_id ) THEN NULL - ELSE hk_referrer(ref) + -- Inline hk_referrer's fallback: IMPORT may restore this macro first. + WHEN ref IS NULL OR ref = '' THEN '(Direct)' + WHEN ref LIKE 'http%' THEN regexp_extract(ref, 'https?://([^/]+)', 1) + ELSE ref END ); diff --git a/database/migrations/tenant/0018_normalize_self_referrers.sql b/database/migrations/tenant/0018_normalize_self_referrers.sql index b2491a6a8..43f92b92e 100644 --- a/database/migrations/tenant/0018_normalize_self_referrers.sql +++ b/database/migrations/tenant/0018_normalize_self_referrers.sql @@ -8,6 +8,9 @@ CREATE OR REPLACE MACRO hk_external_referrer(ref, ref_site_id) AS ( SELECT regexp_replace(lower(trim(domain)), '^www\.', '') FROM sites WHERE id = ref_site_id ) THEN NULL - ELSE hk_referrer(ref) + -- Inline hk_referrer's fallback: IMPORT may restore this macro first. + WHEN ref IS NULL OR ref = '' THEN '(Direct)' + WHEN ref LIKE 'http%' THEN regexp_extract(ref, 'https?://([^/]+)', 1) + ELSE ref END );