diff options
author | Alex Gleason <alex@alexgleason.me> | 2021-08-04 11:48:57 -0500 |
---|---|---|
committer | Alex Gleason <alex@alexgleason.me> | 2021-08-04 11:48:57 -0500 |
commit | 44ede0657f2da0a761de76b1f9822a293430d497 (patch) | |
tree | 387a8915bdb6ff1295f4f0872b2e6bc97e177831 /lib/pleroma/web/controller_helper.ex | |
parent | 1f093cb216ed0d6b0d23b05e1ffbbf55dc72bbee (diff) | |
parent | d8a986c9e893de8eed3aa336a557695669b1ffee (diff) | |
download | pleroma-44ede0657f2da0a761de76b1f9822a293430d497.tar.gz |
Merge remote-tracking branch 'pleroma/develop' into staff-plug
Diffstat (limited to 'lib/pleroma/web/controller_helper.ex')
-rw-r--r-- | lib/pleroma/web/controller_helper.ex | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/lib/pleroma/web/controller_helper.ex b/lib/pleroma/web/controller_helper.ex index 61d65e7a3..7b84b43e4 100644 --- a/lib/pleroma/web/controller_helper.ex +++ b/lib/pleroma/web/controller_helper.ex @@ -6,17 +6,7 @@ defmodule Pleroma.Web.ControllerHelper do use Pleroma.Web, :controller alias Pleroma.Pagination - - # As in Mastodon API, per https://api.rubyonrails.org/classes/ActiveModel/Type/Boolean.html - @falsy_param_values [false, 0, "0", "f", "F", "false", "False", "FALSE", "off", "OFF"] - - def explicitly_falsy_param?(value), do: value in @falsy_param_values - - # Note: `nil` and `""` are considered falsy values in Pleroma - def falsy_param?(value), - do: explicitly_falsy_param?(value) or value in [nil, ""] - - def truthy_param?(value), do: not falsy_param?(value) + alias Pleroma.Web.Utils.Params def json_response(conn, status, _) when status in [204, :no_content] do conn @@ -123,6 +113,6 @@ defmodule Pleroma.Web.ControllerHelper do # To do once OpenAPI transition mess is over: just `truthy_param?(params[:with_relationships])` params |> Map.get(:with_relationships, params["with_relationships"]) - |> truthy_param?() + |> Params.truthy_param?() end end |