From db03cc0ac692d90fe942fb628f4435849764bb68 Mon Sep 17 00:00:00 2001 From: Vinicius Brasil Date: Mon, 26 Sep 2022 06:30:20 -0300 Subject: [PATCH] Fix timezone list when time changes (#2268) This commit fixes an exception when calling `Timex.Timezone.get/2` after there has been a timezone change. Similar issues have already been reported in Timex (bitwaker/timex#691, bitwalker/timex#555, bitwalker/timex#625). This skips timezones from the list when they fail to fetch, and use `Timex.Timezone.get/2` to get the current offset using `DateTime.utc_now/0` instead of the `NaiveDateTime` default. --- lib/plausible/timezones.ex | 41 ++++++++++++++++++++----------- test/plausible/timezones_test.exs | 5 ++++ 2 files changed, 31 insertions(+), 15 deletions(-) diff --git a/lib/plausible/timezones.ex b/lib/plausible/timezones.ex index 3080880c2..a8dee96c9 100644 --- a/lib/plausible/timezones.ex +++ b/lib/plausible/timezones.ex @@ -1,24 +1,35 @@ defmodule Plausible.Timezones do - @spec options() :: [{:key, String.t()}, {:value, String.t()}, {:offset, integer()}] - def options do + @spec options(DateTime.t()) :: [{:key, String.t()}, {:value, String.t()}, {:offset, integer()}] + def options(now \\ DateTime.utc_now()) do Tzdata.zone_list() - |> Enum.map(&build_option/1) + |> Enum.reduce([], fn timezone_code, acc -> build_option(timezone_code, acc, now) end) |> Enum.sort_by(& &1[:offset], :desc) end - defp build_option(timezone_code) do - timezone_info = Timex.Timezone.get(timezone_code) - offset_in_minutes = timezone_info |> Timex.Timezone.total_offset() |> div(-60) + defp build_option(timezone_code, acc, now) do + case Timex.Timezone.get(timezone_code, now) do + %Timex.TimezoneInfo{} = timezone_info -> + offset_in_minutes = timezone_info |> Timex.Timezone.total_offset() |> div(-60) - hhmm_formatted_offset = - timezone_info - |> Timex.TimezoneInfo.format_offset() - |> String.slice(0..-4) + hhmm_formatted_offset = + timezone_info + |> Timex.TimezoneInfo.format_offset() + |> String.slice(0..-4) - [ - key: "(GMT#{hhmm_formatted_offset}) #{timezone_code}", - value: timezone_code, - offset: offset_in_minutes - ] + option = [ + key: "(GMT#{hhmm_formatted_offset}) #{timezone_code}", + value: timezone_code, + offset: offset_in_minutes + ] + + [option | acc] + + error -> + Sentry.capture_message("Failed to fetch timezone", + extra: %{code: timezone_code, error: inspect(error)} + ) + + acc + end end end diff --git a/test/plausible/timezones_test.exs b/test/plausible/timezones_test.exs index 14c8359c7..44c7a34b4 100644 --- a/test/plausible/timezones_test.exs +++ b/test/plausible/timezones_test.exs @@ -11,4 +11,9 @@ defmodule Plausible.TimezonesTest do hawaii = Enum.find(options, &(&1[:value] == "US/Hawaii")) assert [key: "(GMT-10:00) US/Hawaii", value: "US/Hawaii", offset: 600] = hawaii end + + test "options/0 does not fail during time changes" do + options = Plausible.Timezones.options(~N[2021-10-03 02:31:07]) + refute Enum.empty?(options) + end end