diff options
author | lain <lain@soykaf.club> | 2020-04-30 16:49:41 +0200 |
---|---|---|
committer | lain <lain@soykaf.club> | 2020-04-30 16:49:41 +0200 |
commit | 14c667219334c492ae0549ad0f1e062085d7d412 (patch) | |
tree | 4972b55fa90ef12df648379a9e01a3fc24d9d345 | |
parent | fdd8e7f27697a7128e4e92020cdff6389c999acc (diff) | |
download | pleroma-14c667219334c492ae0549ad0f1e062085d7d412.tar.gz pleroma-14c667219334c492ae0549ad0f1e062085d7d412.zip |
AP C2S: Use common pipelin for deletes.
-rw-r--r-- | lib/pleroma/web/activity_pub/activity_pub_controller.ex | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/web/activity_pub/activity_pub_controller.ex b/lib/pleroma/web/activity_pub/activity_pub_controller.ex index d625530ec..e68d0763e 100644 --- a/lib/pleroma/web/activity_pub/activity_pub_controller.ex +++ b/lib/pleroma/web/activity_pub/activity_pub_controller.ex @@ -414,7 +414,8 @@ defmodule Pleroma.Web.ActivityPub.ActivityPubController do defp handle_user_activity(%User{} = user, %{"type" => "Delete"} = params) do with %Object{} = object <- Object.normalize(params["object"]), true <- user.is_moderator || user.ap_id == object.data["actor"], - {:ok, delete} <- ActivityPub.delete(object) do + {:ok, delete_data, _} <- Builder.delete(user, object.data["id"]), + {:ok, delete, _} <- Pipeline.common_pipeline(delete_data, local: true) do {:ok, delete} else _ -> {:error, dgettext("errors", "Can't delete object")} |