summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfeld <feld@feld.me>2024-08-24 16:53:22 +0000
committerMark Felder <feld@feld.me>2024-08-29 11:59:42 -0400
commit27fcc421719062d5de9bf4dc90f3349595eb278d (patch)
tree2450bebc8c060c50a2c5996cb8b86a9d212187b2
parent1c394dd18c5d61dc716a9b9cda981a359de32456 (diff)
downloadpleroma-27fcc421719062d5de9bf4dc90f3349595eb278d.tar.gz
pleroma-27fcc421719062d5de9bf4dc90f3349595eb278d.zip
Use Pleroma.Object.Containment.get_actor/1 to reliably find the actor of an incoming activity or object
-rw-r--r--lib/pleroma/web/activity_pub/activity_pub_controller.ex5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/pleroma/web/activity_pub/activity_pub_controller.ex b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
index a24dcfc9c..77ec26f14 100644
--- a/lib/pleroma/web/activity_pub/activity_pub_controller.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub_controller.ex
@@ -567,9 +567,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do
defp unknown_delete?(%{
"type" => "Delete",
- "actor" => actor
- }) do
- case User.get_cached_by_ap_id(actor) do
+ } = data) do
+ case data |> Pleroma.Object.Containment.get_actor() |> User.get_cached_by_ap_id() do
%User{} -> false
_ -> true
end