diff options
| author | kaniini <nenolod@gmail.com> | 2018-09-10 02:03:01 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-09-10 02:03:01 +0000 |
| commit | da3f93054392447638d4bc558fae0969e6a9bbf9 (patch) | |
| tree | 5411e33d5a74d53fc270f42d703802a0d9a60ef5 /lib | |
| parent | b0a5637254db8d9704b39f5c52d1429421f8628f (diff) | |
| parent | d3248e13e3fb13ca5b841ba31ca6fa5f3f65b501 (diff) | |
| download | pleroma-da3f93054392447638d4bc558fae0969e6a9bbf9.tar.gz | |
Merge branch 'bugfix/activitypub-bot-profile-update' into 'develop'
activitypub: transmogrifier: allow profile updates from bots
See merge request pleroma/pleroma!341
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/activity_pub/transmogrifier.ex | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex index 4a3a82195..48c3aec97 100644 --- 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) |