diff --git a/.tool-versions b/.tool-versions index 0a6bd54a3..45cfb3b23 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,3 +1,3 @@ erlang 21.1 -elixir 1.11 +elixir 1.10 nodejs 15.3.0 diff --git a/lib/plausible/stats/query.ex b/lib/plausible/stats/query.ex index 8645a3d92..35eddd8c2 100644 --- a/lib/plausible/stats/query.ex +++ b/lib/plausible/stats/query.ex @@ -9,7 +9,7 @@ defmodule Plausible.Stats.Query do def shift_back(%__MODULE__{period: "month"} = query, site) do {new_first, new_last} = if Timex.compare(Timex.now(site.timezone), query.date_range.first, :month) == 0 do # Querying current month to date diff = Timex.diff(Timex.beginning_of_month(Timex.now(site.timezone)), Timex.now(site.timezone), :days) - 1 - {query.date_range.first |> Timex.shift(days: diff), Timex.now(site.timezone) |> Timex.shift(days: diff)} + {query.date_range.first |> Timex.shift(days: diff), Timex.now(site.timezone) |> Timex.to_date |> Timex.shift(days: diff)} else diff = Timex.diff(query.date_range.first, query.date_range.last, :days) - 1 {query.date_range.first |> Timex.shift(days: diff), query.date_range.last |> Timex.shift(days: diff)}