Chapril/mobilizon.chapril.org-mobilizon
Chapril/mobilizon.chapril.org-mobilizon
25
0
Fork 0
Code Issues Pull Requests Releases Activity

Make sure timezone as an UTC fallback in case it's nil

Browse Source 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
This commit is contained in:
Thomas Citharel 2022-03-29 10:38:50 +02:00
parent 0bc931fef0
commit 9ddcd6dff6
No known key found for this signature in database
GPG Key ID: A061B9DDE0CA0773
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/service/date_time/date_time.ex
View File

@ -182,7 +182,7 @@ defmodule Mobilizon.Service.DateTime do
compare_to_day = Keyword.get(options, :compare_to_day, Date.utc_today()) compare_to_day = Keyword.get(options, :compare_to_day, Date.utc_today())
compare_to = Keyword.get(options, :compare_to_datetime, DateTime.utc_now()) compare_to = Keyword.get(options, :compare_to_datetime, DateTime.utc_now())
start_time = Keyword.get(options, :start_time, @start_time) start_time = Keyword.get(options, :start_time, @start_time)
timezone = Keyword.get(options, :timezone, "Etc/UTC") timezone = Keyword.get(options, :timezone, "Etc/UTC") || "Etc/UTC"
end_time = Keyword.get(options, :end_time, @end_time) end_time = Keyword.get(options, :end_time, @end_time)
DateTime.compare(compare_to, DateTime.new!(compare_to_day, start_time, timezone)) in [ DateTime.compare(compare_to, DateTime.new!(compare_to_day, start_time, timezone)) in [

4
lib/service/workers/notification.ex
View File

@ -46,7 +46,7 @@ defmodule Mobilizon.Service.Workers.Notification do
}) do }) do
with %User{locale: locale, settings: %Setting{timezone: timezone, notification_on_day: true}} = with %User{locale: locale, settings: %Setting{timezone: timezone, notification_on_day: true}} =
user <- Users.get_user_with_settings!(user_id), user <- Users.get_user_with_settings!(user_id),
{start, tomorrow} <- calculate_start_end(1, timezone), {start, tomorrow} <- calculate_start_end(1, timezone || "Etc/UTC"),
%Page{ %Page{
elements: participations, elements: participations,
total: total total: total
@ -80,7 +80,7 @@ defmodule Mobilizon.Service.Workers.Notification do
locale: locale, locale: locale,
settings: %Setting{timezone: timezone, notification_each_week: true} settings: %Setting{timezone: timezone, notification_each_week: true}
} = user <- Users.get_user_with_settings!(user_id), } = user <- Users.get_user_with_settings!(user_id),
{start, end_week} <- calculate_start_end(7, timezone), {start, end_week} <- calculate_start_end(7, timezone || "Etc/UTC"),
%Page{ %Page{
elements: participations, elements: participations,
total: total total: total