pleroma

commit: 9367b70f37ba11f22c456dc6b8dd9366ced84386
parent: 7731f9a4473fa46d38632b5e8fc37aca006ff1f3
Author: rinpatch <rinpatch@sdf.org>
Date:   Mon, 20 Jan 2020 10:25:17 +0000

Merge branch 'features/cleanup-incoming-actor' into 'develop'

transmogrifier.ex: simplify handle_incoming of actors

See merge request pleroma/pleroma!2114
Diffstat:
M
lib/pleroma/web/activity_pub/transmogrifier.ex
18
+-----------------

1 file changed, 1 insertion(+), 17 deletions(-)
diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -658,24 +658,8 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
     with %User{ap_id: ^actor_id} = actor <- User.get_cached_by_ap_id(object["id"]) do
       {:ok, new_user_data} = ActivityPub.user_data_from_user_object(object)
 
-      locked = new_user_data[:locked] || false
-      attachment = get_in(new_user_data, [:source_data, "attachment"]) || []
-      invisible = new_user_data[:invisible] || false
-
-      fields =
-        attachment
-        |> Enum.filter(fn %{"type" => t} -> t == "PropertyValue" end)
-        |> Enum.map(fn fields -> Map.take(fields, ["name", "value"]) end)
-
-      update_data =
-        new_user_data
-        |> Map.take([:avatar, :banner, :bio, :name, :also_known_as])
-        |> Map.put(:fields, fields)
-        |> Map.put(:locked, locked)
-        |> Map.put(:invisible, invisible)
-
       actor
-      |> User.upgrade_changeset(update_data, true)
+      |> User.upgrade_changeset(new_user_data, true)
       |> User.update_and_set_cache()
 
       ActivityPub.update(%{