diff options
author | lain <lain@soykaf.club> | 2020-05-06 17:36:08 +0200 |
---|---|---|
committer | lain <lain@soykaf.club> | 2020-05-06 17:36:08 +0200 |
commit | 1748e2694815da20689005110937ea42cd554d70 (patch) | |
tree | a869f3fb48840f9b7f318d8e498024cb8d7ba277 /lib/pleroma/web/common_api/common_api.ex | |
parent | fc9d0b6eec1b206a27f4ec19f7939b3318a209ef (diff) | |
parent | a32483f224ff1659350bc6e114aa4ba2bcb340a5 (diff) | |
download | pleroma-1748e2694815da20689005110937ea42cd554d70.tar.gz |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
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 38b5c6f7c..d7d934683 100644 --- a/lib/pleroma/web/common_api/common_api.ex +++ b/lib/pleroma/web/common_api/common_api.ex @@ -110,8 +110,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} |