diff options
| author | lain <lain@soykaf.club> | 2020-02-11 13:58:36 +0100 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-02-11 13:58:36 +0100 |
| commit | 24c526a0b18b822ae339a481934bfa66b13bba54 (patch) | |
| tree | 11d7c9bb2bf5503b536ee0ab72533974e9a7b21b /lib/pleroma/web/common_api/utils.ex | |
| parent | 57098713c02363aaee78d519726e6f2975f725d8 (diff) | |
| parent | 2f1c61255ff95a1d21a751cb78da3c031ccdd692 (diff) | |
| download | pleroma-24c526a0b18b822ae339a481934bfa66b13bba54.tar.gz | |
Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulge
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} |