diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-02-08 19:59:37 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-02-08 19:59:37 +0300 |
| commit | 4e6bbdc7b549e630141cb10d383a42055f06dc16 (patch) | |
| tree | d0675328c7fc75f612eab779289afabee27a40a8 /lib/pleroma/web/common_api/utils.ex | |
| parent | d458f4fdcafe847a7db8b1c663cfd945019816b7 (diff) | |
| parent | 964b4d82a0cde5b552b6210400c5e2c747a2f0e0 (diff) | |
| download | pleroma-4e6bbdc7b549e630141cb10d383a42055f06dc16.tar.gz | |
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
Diffstat (limited to 'lib/pleroma/web/common_api/utils.ex')
| -rw-r--r-- | lib/pleroma/web/common_api/utils.ex | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex index a9b164d9a..ca6c93862 100644 --- a/lib/pleroma/web/common_api/utils.ex +++ b/lib/pleroma/web/common_api/utils.ex @@ -179,9 +179,9 @@ defmodule Pleroma.Web.CommonAPI.Utils do end) end_time = - NaiveDateTime.utc_now() - |> NaiveDateTime.add(expires_in) - |> NaiveDateTime.to_iso8601() + DateTime.utc_now() + |> DateTime.add(expires_in) + |> DateTime.to_iso8601() key = if truthy_param?(data["poll"]["multiple"]), do: "anyOf", else: "oneOf" poll = %{"type" => "Question", key => option_notes, "closed" => end_time} |