diff options
author | lain <lain@soykaf.club> | 2020-08-12 15:07:46 +0200 |
---|---|---|
committer | lain <lain@soykaf.club> | 2020-08-12 15:07:46 +0200 |
commit | 2e347e8286fab13075e6e39e64e56cb3ba14e7e8 (patch) | |
tree | f2fb28901ba6bb45138d44b5f432235b506a368a /lib/pleroma/web/common_api | |
parent | 7224bf309ef38a80898d7e560e96fbc2895737be (diff) | |
download | pleroma-2e347e8286fab13075e6e39e64e56cb3ba14e7e8.tar.gz |
ActivityPub: Remove `reject`, move everything to the Pipeline.
Diffstat (limited to 'lib/pleroma/web/common_api')
-rw-r--r-- | lib/pleroma/web/common_api/common_api.ex | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex index 7b08c19a8..a8141b28f 100644 --- a/lib/pleroma/web/common_api/common_api.ex +++ b/lib/pleroma/web/common_api/common_api.ex @@ -6,9 +6,7 @@ defmodule Pleroma.Web.CommonAPI do alias Pleroma.Activity alias Pleroma.ActivityExpiration alias Pleroma.Conversation.Participation - alias Pleroma.FollowingRelationship alias Pleroma.Formatter - alias Pleroma.Notification alias Pleroma.Object alias Pleroma.ThreadMute alias Pleroma.User @@ -130,16 +128,8 @@ defmodule Pleroma.Web.CommonAPI do def reject_follow_request(follower, followed) do with %Activity{} = follow_activity <- Utils.fetch_latest_follow(follower, followed), - {:ok, follow_activity} <- Utils.update_follow_state_for_all(follow_activity, "reject"), - {:ok, _relationship} <- FollowingRelationship.update(follower, followed, :follow_reject), - {:ok, _notifications} <- Notification.dismiss(follow_activity), - {:ok, _activity} <- - ActivityPub.reject(%{ - to: [follower.ap_id], - actor: followed, - object: follow_activity.data["id"], - type: "Reject" - }) do + {:ok, reject_data, _} <- Builder.reject(followed, follow_activity), + {:ok, _activity, _} <- Pipeline.common_pipeline(reject_data, local: true) do {:ok, follower} end end |