aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorSergey Suprunenko <suprunenko.s@gmail.com>2019-04-01 22:40:48 +0200
committerSergey Suprunenko <suprunenko.s@gmail.com>2019-04-01 22:45:24 +0200
commitb6f9f7b8aa659c10049b8c43326e58a4b1b18664 (patch)
tree95b5a133bc4188ba948ebb99f8782095a61010ce /lib
parentd976cc5df7b6f4fec6c38811ab37fe040cc695fd (diff)
downloadpleroma-b6f9f7b8aa659c10049b8c43326e58a4b1b18664.tar.gz
Handle dates in the Unix timestamp format (Fixes #763)
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/common_api/utils.ex17
1 files changed, 16 insertions, 1 deletions
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex
index f596f703b..3f5348d66 100644
--- a/lib/pleroma/web/common_api/utils.ex
+++ b/lib/pleroma/web/common_api/utils.ex
@@ -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 ->