moon
/
honkoma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use actor_types() to determine whether the Update is for user

This commit is contained in:
Tusooa Zhu 2022-08-02 10:15:56 -04:00
parent 997f08b350
commit a4fa286d20
No known key found for this signature in database
GPG Key ID: 7B467EDE43A08224
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/pleroma/web/activity_pub/side_effects.ex
View File

@ -163,8 +163,9 @@ def handle(%{data: %{"type" => "Update", "object" => updated_object}} = object,
updated_object_id = updated_object["id"] updated_object_id = updated_object["id"]
with {_, true} <- {:has_id, is_binary(updated_object_id)}, with {_, true} <- {:has_id, is_binary(updated_object_id)},
{_, user} <- {:user, Pleroma.User.get_by_ap_id(updated_object_id)} do %{"type" => type} <- updated_object,
if user do {_, is_user} <- {:is_user, type in Pleroma.Constants.actor_types()} do
if is_user do
handle_update_user(object, meta) handle_update_user(object, meta)
else else
handle_update_object(object, meta) handle_update_object(object, meta)

5
test/pleroma/web/activity_pub/side_effects_test.exs
View File

@ -118,7 +118,10 @@ test "it blocks but does not unfollow if the relevant setting is set", %{
describe "update users" do describe "update users" do
setup do setup do
user = insert(:user, local: false) user = insert(:user, local: false)
{:ok, update_data, []} = Builder.update(user, %{"id" => user.ap_id, "name" => "new name!"})
{:ok, update_data, []} =
Builder.update(user, %{"id" => user.ap_id, "type" => "Person", "name" => "new name!"})
{:ok, update, _meta} = ActivityPub.persist(update_data, local: true) {:ok, update, _meta} = ActivityPub.persist(update_data, local: true)
%{user: user, update_data: update_data, update: update} %{user: user, update_data: update_data, update: update}