diff options
| author | Sean King <seanking2919@protonmail.com> | 2021-07-10 11:04:16 -0600 |
|---|---|---|
| committer | Sean King <seanking2919@protonmail.com> | 2021-07-10 11:04:16 -0600 |
| commit | 5d279a22b162e7d8a871db1b9368a888e92ea167 (patch) | |
| tree | 1d89f3c93ee1dc46b185f6d438828fb0b572e6be /lib/pleroma/web/common_api/utils.ex | |
| parent | 26d2c677b78b7cc22a98dfe4648e5b3f5b4da3ea (diff) | |
| parent | aa9a6c3c056fde45b4c13c9c873cef9492b279e9 (diff) | |
| download | pleroma-5d279a22b162e7d8a871db1b9368a888e92ea167.tar.gz | |
Merge develop branch upstream
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 4cc34002d..33639e695 100644 --- a/lib/pleroma/web/common_api/utils.ex +++ b/lib/pleroma/web/common_api/utils.ex @@ -4,7 +4,6 @@ defmodule Pleroma.Web.CommonAPI.Utils do import Pleroma.Web.Gettext - import Pleroma.Web.ControllerHelper, only: [truthy_param?: 1] alias Calendar.Strftime alias Pleroma.Activity @@ -19,6 +18,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do alias Pleroma.Web.CommonAPI.ActivityDraft alias Pleroma.Web.MediaProxy alias Pleroma.Web.Plugs.AuthenticationPlug + alias Pleroma.Web.Utils.Params require Logger require Pleroma.Constants @@ -160,7 +160,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do |> DateTime.add(expires_in) |> DateTime.to_iso8601() - key = if truthy_param?(data.poll[:multiple]), do: "anyOf", else: "oneOf" + key = if Params.truthy_param?(data.poll[:multiple]), do: "anyOf", else: "oneOf" poll = %{"type" => "Question", key => option_notes, "closed" => end_time} {:ok, {poll, emoji}} @@ -203,7 +203,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do attachment_links = draft.params |> Map.get("attachment_links", Config.get([:instance, :attachment_links])) - |> truthy_param?() + |> Params.truthy_param?() content_type = get_content_type(draft.params[:content_type]) |