X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fuser%2Finfo.ex;h=45a39924b94853a377244d06ba2106fc6650b741;hb=8dc6a6b210e56ec1a175a3496466d1f8aa62f128;hp=47e7df911a785726661e5f4a1eec366645252097;hpb=e457fcc47971df6c76c3da096e6b45c2972e4029;p=akkoma

diff --git a/lib/pleroma/user/info.ex b/lib/pleroma/user/info.ex
index 47e7df911..45a39924b 100644
--- a/lib/pleroma/user/info.ex
+++ b/lib/pleroma/user/info.ex
@@ -423,9 +423,12 @@ defmodule Pleroma.User.Info do
   # ``fields`` is an array of mastodon profile field, containing ``{"name": "…", "value": "…"}``.
   # For example: [{"name": "Pronoun", "value": "she/her"}, …]
   def fields(%{fields: [], source_data: %{"attachment" => attachment}}) do
+    limit = Pleroma.Config.get([:instance, :max_remote_account_fields], 0)
+
     attachment
     |> Enum.filter(fn %{"type" => t} -> t == "PropertyValue" end)
     |> Enum.map(fn fields -> Map.take(fields, ["name", "value"]) end)
+    |> Enum.take(limit)
   end
 
   def fields(%{fields: fields}), do: fields