Merge branch 'bugfix/activitypub-bot-profile-update' into 'develop'

activitypub: transmogrifier: allow profile updates from bots

See merge request pleroma/pleroma!341
This commit is contained in:
kaniini 2018-09-10 02:03:01 +00:00
commit da3f930543

View File

@ -355,9 +355,10 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
end end
def handle_incoming( def handle_incoming(
%{"type" => "Update", "object" => %{"type" => "Person"} = object, "actor" => actor_id} = %{"type" => "Update", "object" => %{"type" => object_type} = object, "actor" => actor_id} =
data data
) do )
when object_type in ["Person", "Application", "Service", "Organization"] do
with %User{ap_id: ^actor_id} = actor <- User.get_by_ap_id(object["id"]) do with %User{ap_id: ^actor_id} = actor <- User.get_by_ap_id(object["id"]) do
{:ok, new_user_data} = ActivityPub.user_data_from_user_object(object) {:ok, new_user_data} = ActivityPub.user_data_from_user_object(object)