Handle dates in the Unix timestamp format (Fixes #763)
This commit is contained in:
parent
d976cc5df7
commit
b6f9f7b8aa
2 changed files with 53 additions and 1 deletions
|
@ -240,8 +240,23 @@ defmodule Pleroma.Web.CommonAPI.Utils do
|
|||
Strftime.strftime!(date, "%a %b %d %H:%M:%S %z %Y")
|
||||
end
|
||||
|
||||
def date_to_asctime(date) when is_float(date) do
|
||||
date
|
||||
|> trunc()
|
||||
|> date_to_asctime()
|
||||
end
|
||||
|
||||
def date_to_asctime(date) when is_integer(date) do
|
||||
with {:ok, date} <- DateTime.from_unix(date) do
|
||||
format_asctime(date)
|
||||
else
|
||||
_e ->
|
||||
""
|
||||
end
|
||||
end
|
||||
|
||||
def date_to_asctime(date) do
|
||||
with {:ok, date, _offset} <- date |> DateTime.from_iso8601() do
|
||||
with {:ok, date, _offset} <- DateTime.from_iso8601(date) do
|
||||
format_asctime(date)
|
||||
else
|
||||
_e ->
|
||||
|
|
|
@ -153,4 +153,41 @@ defmodule Pleroma.Web.CommonAPI.UtilsTest do
|
|||
assert conversation_id == object.id
|
||||
end
|
||||
end
|
||||
|
||||
describe "formats date to asctime" do
|
||||
test "when date is an integer Unix timestamp" do
|
||||
date = DateTime.utc_now() |> DateTime.to_unix()
|
||||
|
||||
expected =
|
||||
date
|
||||
|> DateTime.from_unix!()
|
||||
|> Calendar.Strftime.strftime!("%a %b %d %H:%M:%S %z %Y")
|
||||
|
||||
assert Utils.date_to_asctime(date) == expected
|
||||
end
|
||||
|
||||
test "when date is a float Unix timestamp" do
|
||||
date = 1_553_808_404.602961
|
||||
|
||||
expected =
|
||||
date
|
||||
|> trunc()
|
||||
|> DateTime.from_unix!()
|
||||
|> Calendar.Strftime.strftime!("%a %b %d %H:%M:%S %z %Y")
|
||||
|
||||
assert Utils.date_to_asctime(date) == expected
|
||||
end
|
||||
|
||||
test "when date is in ISO 8601 format" do
|
||||
date = DateTime.utc_now() |> DateTime.to_iso8601()
|
||||
|
||||
expected =
|
||||
date
|
||||
|> DateTime.from_iso8601()
|
||||
|> elem(1)
|
||||
|> Calendar.Strftime.strftime!("%a %b %d %H:%M:%S %z %Y")
|
||||
|
||||
assert Utils.date_to_asctime(date) == expected
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue