diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-02-11 13:54:55 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-02-11 13:54:55 +0400 |
| commit | 6875ccb6bfcc5ae62db26d38c3d5eac4c6f8706a (patch) | |
| tree | dacb02d953473e3a0c6aeec58d86fb7fb1ed5886 /lib/pleroma/web/common_api/utils.ex | |
| parent | 3c4a30c6db312aff2afbfcd423498be19c02c68c (diff) | |
| parent | 5ebffd5224729413e53a55ddda9a1f86224d7d73 (diff) | |
| download | pleroma-6875ccb6bfcc5ae62db26d38c3d5eac4c6f8706a.tar.gz | |
Merge branch 'develop' into feature/new-registrations-digest
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} |