logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: 503139b3431799fed3f280d990fb26c6632f2f25
parent: 5e7098cf69bc8d113279168f6bbc728c6f317727
Author: kaniini <ariadne@dereferenced.org>
Date:   Sun, 25 Aug 2019 19:35:28 +0000

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

Fix not to use unupdated attachments when all fields are deleted

See merge request pleroma/pleroma!1596

Diffstat:

Mlib/pleroma/user/info.ex6++++--
Mtest/web/activity_pub/transmogrifier_test.exs8++++++++
2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/lib/pleroma/user/info.ex b/lib/pleroma/user/info.ex @@ -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 diff --git a/test/web/activity_pub/transmogrifier_test.exs b/test/web/activity_pub/transmogrifier_test.exs @@ -563,6 +563,14 @@ defmodule Pleroma.Web.ActivityPub.TransmogrifierTest do %{"name" => "foo", "value" => "updated"}, %{"name" => "foo1", "value" => "updated"} ] + + update_data = put_in(update_data, ["object", "attachment"], []) + + {:ok, _} = Transmogrifier.handle_incoming(update_data) + + user = User.get_cached_by_ap_id(user.ap_id) + + assert User.Info.fields(user.info) == [] end test "it works for incoming update activities which lock the account" do