aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkPherox <admin@mail.kr-kp.com>2019-08-26 17:09:32 +0900
committerAriadne Conill <ariadne@dereferenced.org>2019-10-06 15:14:53 +0000
commitc5338764df032f50043e365f17111c8b926b97a8 (patch)
treee3b474904427352be7f5edf5e2c071d298032426
parentcc84563796f5004aca3b1f71b54381394fbc1c96 (diff)
downloadpleroma-c5338764df032f50043e365f17111c8b926b97a8.tar.gz
Extract if block into private function
-rw-r--r--lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex15
1 files changed, 10 insertions, 5 deletions
diff --git a/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
index f20105bee..fcca6858d 100644
--- a/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
+++ b/lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
@@ -119,6 +119,14 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
end
end
+ defp normalize_fields_attributes(fields) do
+ if Enum.all?(fields, &is_tuple/1) do
+ Enum.map(fields, fn {_, v} -> v end)
+ else
+ fields
+ end
+ end
+
def update_credentials(%{assigns: %{user: user}} = conn, params) do
original_user = user
@@ -146,11 +154,8 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
params =
if Map.has_key?(params, "fields_attributes") do
Map.update!(params, "fields_attributes", fn fields ->
- if Enum.all?(fields, &is_tuple/1) do
- Enum.map(fields, fn {_, v} -> v end)
- else
- fields
- end
+ fields
+ |> normalize_fields_attributes()
|> Enum.filter(fn %{"name" => n} -> n != "" end)
end)
else