From: kPherox <admin@mail.kr-kp.com>
Date: Mon, 26 Aug 2019 08:09:32 +0000 (+0900)
Subject: Extract if block into private function
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=c5338764df032f50043e365f17111c8b926b97a8;p=akkoma

Extract if block into private function
---

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