summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTusooa Zhu <tusooa@kazv.moe>2022-08-02 10:15:56 -0400
committerTusooa Zhu <tusooa@kazv.moe>2022-08-02 10:37:28 -0400
commita4fa286d200b4f0c0ac9f453eb3e0a0526560a20 (patch)
tree8c1259d4aa0b2bbc920320c281ad1585aead4e0b
parent997f08b3500a983e8b27db9a6e4745582bb4763c (diff)
downloadpleroma-a4fa286d200b4f0c0ac9f453eb3e0a0526560a20.tar.gz
pleroma-a4fa286d200b4f0c0ac9f453eb3e0a0526560a20.zip
Use actor_types() to determine whether the Update is for user
-rw-r--r--lib/pleroma/web/activity_pub/side_effects.ex5
-rw-r--r--test/pleroma/web/activity_pub/side_effects_test.exs5
2 files changed, 7 insertions, 3 deletions
diff --git a/lib/pleroma/web/activity_pub/side_effects.ex b/lib/pleroma/web/activity_pub/side_effects.ex
index f56e357bf..5eefd2824 100644
--- a/lib/pleroma/web/activity_pub/side_effects.ex
+++ b/lib/pleroma/web/activity_pub/side_effects.ex
@@ -163,8 +163,9 @@ defmodule Pleroma.Web.ActivityPub.SideEffects do
updated_object_id = updated_object["id"]
with {_, true} <- {:has_id, is_binary(updated_object_id)},
- {_, user} <- {:user, Pleroma.User.get_by_ap_id(updated_object_id)} do
- if user do
+ %{"type" => type} <- updated_object,
+ {_, is_user} <- {:is_user, type in Pleroma.Constants.actor_types()} do
+ if is_user do
handle_update_user(object, meta)
else
handle_update_object(object, meta)
diff --git a/test/pleroma/web/activity_pub/side_effects_test.exs b/test/pleroma/web/activity_pub/side_effects_test.exs
index 0db3a8ea6..9d3490ecd 100644
--- a/test/pleroma/web/activity_pub/side_effects_test.exs
+++ b/test/pleroma/web/activity_pub/side_effects_test.exs
@@ -118,7 +118,10 @@ defmodule Pleroma.Web.ActivityPub.SideEffectsTest do
describe "update users" do
setup do
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)
%{user: user, update_data: update_data, update: update}