|
|
|
|
@ -34,6 +34,19 @@ defmodule Plausible.Stats.Filters do
|
|
|
|
|
new_val = Plausible.Stats.CountryName.to_alpha2(filter_val)
|
|
|
|
|
Map.put(new_filters, "visit:country", {filter_type, new_val})
|
|
|
|
|
|
|
|
|
|
name == "goal" ->
|
|
|
|
|
filter =
|
|
|
|
|
case val do
|
|
|
|
|
"Visit " <> page ->
|
|
|
|
|
{filter_type, filter_val} = filter_value(name, page)
|
|
|
|
|
{filter_type, :page, filter_val}
|
|
|
|
|
|
|
|
|
|
event ->
|
|
|
|
|
{:is, :event, event}
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
Map.put(new_filters, "visit:goal", filter)
|
|
|
|
|
|
|
|
|
|
name in (@visit_props ++ ["goal"]) ->
|
|
|
|
|
Map.put(new_filters, "visit:" <> name, filter_value(name, val))
|
|
|
|
|
|
|
|
|
|
@ -44,9 +57,6 @@ defmodule Plausible.Stats.Filters do
|
|
|
|
|
Enum.reduce(val, new_filters, fn {prop_key, prop_val}, new_filters ->
|
|
|
|
|
Map.put(new_filters, "event:props:" <> prop_key, {:is, prop_val})
|
|
|
|
|
end)
|
|
|
|
|
|
|
|
|
|
true ->
|
|
|
|
|
raise "Unknown filter prop"
|
|
|
|
|
end
|
|
|
|
|
end)
|
|
|
|
|
|
|
|
|
|
@ -54,7 +64,7 @@ defmodule Plausible.Stats.Filters do
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
defp filter_value(key, "!" <> val) do
|
|
|
|
|
if String.contains?(key, "page") && String.match?(val, ~r/\*/) do
|
|
|
|
|
if String.contains?(key, ["page", "goal"]) && String.match?(val, ~r/\*/) do
|
|
|
|
|
{:does_not_match, val}
|
|
|
|
|
else
|
|
|
|
|
{:is_not, val}
|
|
|
|
|
@ -62,7 +72,7 @@ defmodule Plausible.Stats.Filters do
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
defp filter_value(key, val) do
|
|
|
|
|
if String.contains?(key, "page") && String.match?(val, ~r/\*/) do
|
|
|
|
|
if String.contains?(key, ["page", "goal"]) && String.match?(val, ~r/\*/) do
|
|
|
|
|
{:matches, val}
|
|
|
|
|
else
|
|
|
|
|
{:is, val}
|
|
|
|
|
|