Fix tests

lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex

@@ -227,16 +227,29 @@ defmodule Pleroma.Web.ApiSpec.PleromaEmojiPackOperation do
 
   defp emoji_packs_response do
     Operation.response(
-      "Object with pack names as keys and pack contents as values",
+      "Emoji packs and the count",
       "application/json",
       %Schema{
         type: :object,
-        additionalProperties: %Schema{
+        properties: %{
-          emoji_pack()
+          packs: %Schema{
-          | extensions: %{"x-additionalPropertiesName": "Pack name"}
+            type: :object,
+            description: "Object with pack names as keys and pack contents as values",
+            additionalProperties: %Schema{
+              emoji_pack()
+              | extensions: %{"x-additionalPropertiesName": "Pack name"}
+            }
+          },
+          count: %Schema{
+            type: :integer,
+            description: "Number of emoji packs"
+          }
         },
         example: %{
-          "emojos" => emoji_pack().example
+          "packs" => %{
+            "emojos" => emoji_pack().example
+          },
+          "count" => 1
         }
       }
     )

lib/pleroma/web/mastodon_api/controllers/account_controller.ex

@@ -269,14 +269,11 @@ defmodule Pleroma.Web.MastodonAPI.AccountController do
   end
 
   defp normalize_fields_attributes(fields) do
-    if Enum.all?(fields, &is_tuple/1) do
+    if(Enum.all?(fields, &is_tuple/1), do: Enum.map(fields, fn {_, v} -> v end), else: fields)
-      Enum.map(fields, fn {_, v} -> v end)
+    |> Enum.map(fn
-    else
+      %{} = field -> %{"name" => field.name, "value" => field.value}
-      Enum.map(fields, fn
+      field -> field
-        %{} = field -> %{"name" => field.name, "value" => field.value}
+    end)
-        field -> field
-      end)
-    end
   end
 
   @doc "GET /api/v1/accounts/relationships"