diff --git a/lib/plausible_web/templates/email/spike_notification.html.eex b/lib/plausible_web/templates/email/spike_notification.html.eex index 6d27a9ed6..2cb164fbc 100644 --- a/lib/plausible_web/templates/email/spike_notification.html.eex +++ b/lib/plausible_web/templates/email/spike_notification.html.eex @@ -1,25 +1,11 @@ There are currently <%= @current_visitors %> visitors on <%= link(@site.domain, to: "https://" <> @site.domain) %>. -
-
<%= if Enum.count(@sources) > 0 do %> +
+
The top 3 sources for current visitors:
- - - - - - - - - - <%= for %{"name" => source, "count" => visitors} <- @sources do %> - - - - - <% end %> - -
PageVisitors
<%= source %><%= visitors %>
+ <%= for %{name: source, count: visitors} <- @sources do %> + <%= source %> - <%= visitors %> visitors
+ <% end %> <% end %> <%= if @link do %> diff --git a/lib/workers/spike_notifier.ex b/lib/workers/spike_notifier.ex index b8dd7a3ac..add1af17f 100644 --- a/lib/workers/spike_notifier.ex +++ b/lib/workers/spike_notifier.ex @@ -17,7 +17,7 @@ defmodule Plausible.Workers.SpikeNotifier do for notification <- notifications do query = Query.from(notification.site.timezone, %{"period" => "realtime"}) current_visitors = clickhouse.current_visitors(notification.site, query) - sources = clickhouse.top_sources(notification.site, query, 3, 1) + sources = clickhouse.top_sources(notification.site, query, 3, 1, true) notify(notification, current_visitors, sources) end end diff --git a/test/workers/spike_notifier_test.exs b/test/workers/spike_notifier_test.exs index 214a77ace..22a2ce158 100644 --- a/test/workers/spike_notifier_test.exs +++ b/test/workers/spike_notifier_test.exs @@ -9,7 +9,7 @@ defmodule Plausible.Workers.SpikeNotifierTest do insert(:spike_notification, site: site, threshold: 10, recipients: ["jerod@example.com", "uku@example.com"]) clickhouse_stub = stub(Plausible.Stats.Clickhouse, :current_visitors, fn _site, _query -> 5 end) - |> stub(:top_sources, fn _site, _query, _limit, _page -> [] end) + |> stub(:top_sources, fn _site, _query, _limit, _page, _show_noref -> [] end) SpikeNotifier.perform(nil, nil, clickhouse_stub) assert_no_emails_delivered() @@ -20,7 +20,7 @@ defmodule Plausible.Workers.SpikeNotifierTest do insert(:spike_notification, site: site, threshold: 10, recipients: ["jerod@example.com", "uku@example.com"]) clickhouse_stub = stub(Plausible.Stats.Clickhouse, :current_visitors, fn _site, _query -> 10 end) - |> stub(:top_sources, fn _site, _query, _limit, _page -> [] end) + |> stub(:top_sources, fn _site, _query, _limit, _page, _show_noref -> [] end) SpikeNotifier.perform(nil, nil, clickhouse_stub) assert_email_delivered_with( @@ -38,7 +38,7 @@ defmodule Plausible.Workers.SpikeNotifierTest do site = insert(:site) insert(:spike_notification, site: site, threshold: 10, recipients: ["uku@example.com"]) clickhouse_stub = stub(Plausible.Stats.Clickhouse, :current_visitors, fn _site, _query -> 10 end) - |> stub(:top_sources, fn _site, _query, _limit, _page -> [] end) + |> stub(:top_sources, fn _site, _query, _limit, _page, _show_noref -> [] end) SpikeNotifier.perform(nil, nil, clickhouse_stub)