From bcb45a4498ab314d9076cb36f614d3a2a31430d9 Mon Sep 17 00:00:00 2001 From: Karl-Aksel Puulmann Date: Tue, 12 Mar 2024 10:30:19 +0200 Subject: [PATCH] Make event filter handling more consistent External stats controller didn't handle event:page filters. Query#remove_event_filters didn't handle event:name filter removal --- lib/plausible/stats/query.ex | 1 + lib/plausible_web/controllers/api/external_stats_controller.ex | 1 + 2 files changed, 2 insertions(+) diff --git a/lib/plausible/stats/query.ex b/lib/plausible/stats/query.ex index 6af57aca8..ab3c61d91 100644 --- a/lib/plausible/stats/query.ex +++ b/lib/plausible/stats/query.ex @@ -194,6 +194,7 @@ defmodule Plausible.Stats.Query do new_filters = Enum.filter(query.filters, fn {filter_key, _} -> cond do + :name in opts && filter_key == "event:name" -> false :page in opts && filter_key == "event:page" -> false :goal in opts && filter_key == "event:goal" -> false :props in opts && filter_key && String.starts_with?(filter_key, "event:props:") -> false diff --git a/lib/plausible_web/controllers/api/external_stats_controller.ex b/lib/plausible_web/controllers/api/external_stats_controller.ex index b2a82e501..c7f1972da 100644 --- a/lib/plausible_web/controllers/api/external_stats_controller.ex +++ b/lib/plausible_web/controllers/api/external_stats_controller.ex @@ -234,6 +234,7 @@ defmodule PlausibleWeb.Api.ExternalStatsController do end defp event_only_property?("event:name"), do: true + defp event_only_property?("event:page"), do: true defp event_only_property?("event:goal"), do: true defp event_only_property?("event:props:" <> _), do: true defp event_only_property?(_), do: false