logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: da3f93054392447638d4bc558fae0969e6a9bbf9
parent b0a5637254db8d9704b39f5c52d1429421f8628f
Author: kaniini <nenolod@gmail.com>
Date:   Mon, 10 Sep 2018 02:03:01 +0000

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

activitypub: transmogrifier: allow profile updates from bots

See merge request pleroma/pleroma!341

Diffstat:

Mlib/pleroma/web/activity_pub/transmogrifier.ex5+++--
1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex @@ -355,9 +355,10 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do end def handle_incoming( - %{"type" => "Update", "object" => %{"type" => "Person"} = object, "actor" => actor_id} = + %{"type" => "Update", "object" => %{"type" => object_type} = object, "actor" => actor_id} = 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 {:ok, new_user_data} = ActivityPub.user_data_from_user_object(object)