diff options
author | lain <lain@soykaf.club> | 2020-05-07 15:03:12 +0200 |
---|---|---|
committer | lain <lain@soykaf.club> | 2020-05-07 15:03:12 +0200 |
commit | 7ac0cffb34567dd72877e13968a10d206f643ad8 (patch) | |
tree | 061fbd748a1b62ddd0555dcb257c39ff5f2ce48a /lib/pleroma/web/common_api/common_api.ex | |
parent | db55dc944581b1d4b50d1608b2e991050ea29bb3 (diff) | |
parent | b7635bf2b6c5251ffc8f3b3b8e1bc7ee9db83b7e (diff) | |
download | pleroma-7ac0cffb34567dd72877e13968a10d206f643ad8.tar.gz |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/emojireactvalidator
Diffstat (limited to 'lib/pleroma/web/common_api/common_api.ex')
-rw-r--r-- | lib/pleroma/web/common_api/common_api.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex index 192c84eda..b23de2bff 100644 --- a/lib/pleroma/web/common_api/common_api.ex +++ b/lib/pleroma/web/common_api/common_api.ex @@ -79,8 +79,8 @@ defmodule Pleroma.Web.CommonAPI do {:find_activity, Activity.get_by_id_with_object(activity_id)}, %Object{} = object <- Object.normalize(activity), true <- User.superuser?(user) || user.ap_id == object.data["actor"], - {:ok, _} <- unpin(activity_id, user), - {: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 {:find_activity, _} -> {:error, :not_found} |