hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'fix-all-custom-fields-deleted' into 'develop'

Browse source 
Fix not to use unupdated attachments when all fields are deleted

See merge request pleroma/pleroma!1596
This commit is contained in:
kaniini 2019-08-25 19:35:28 +00:00
commit 503139b343
2 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/pleroma/user/info.ex
View file

@ -49,7 +49,7 @@ defmodule Pleroma.User.Info do
field(:mascot, :map, default: nil)
field(:emoji, {:array, :map}, default: [])
field(:pleroma_settings_store, :map, default: %{})
field(:fields, {:array, :map}, default: [])
field(:fields, {:array, :map}, default: nil)
field(:raw_fields, {:array, :map}, default: [])
field(:notification_settings, :map,
@ -422,7 +422,7 @@ 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
def fields(%{fields: nil, source_data: %{"attachment" => attachment}}) do
limit = Pleroma.Config.get([:instance, :max_remote_account_fields], 0)
attachment
@ -431,6 +431,8 @@ defmodule Pleroma.User.Info do
|> Enum.take(limit)
end
def fields(%{fields: nil}), do: []
def fields(%{fields: fields}), do: fields
def follow_information_update(info, params) do