diff options
| author | Lain Soykaf <lain@soykaf.club> | 2020-04-30 22:44:31 +0200 |
|---|---|---|
| committer | Lain Soykaf <lain@soykaf.club> | 2020-04-30 22:44:31 +0200 |
| commit | 93f64aba78f130cced2fa30dd3475e5c446be9d6 (patch) | |
| tree | 0a359b18850594920a47e009e34c110a48f9e0f0 /lib/pleroma/web/common_api | |
| parent | 32b8386edeec3e9b24123c3ccc81a22f1edd5a1c (diff) | |
| parent | a81342a234a3808e2115c888a45c524e39a6ab60 (diff) | |
| download | pleroma-93f64aba78f130cced2fa30dd3475e5c446be9d6.tar.gz | |
Merge branch 'develop' of ssh://git.pleroma.social/pleroma/pleroma into feature/delete-validator
Diffstat (limited to 'lib/pleroma/web/common_api')
| -rw-r--r-- | lib/pleroma/web/common_api/common_api.ex | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex index 7cb8e47d0..adf15b69f 100644 --- a/lib/pleroma/web/common_api/common_api.ex +++ b/lib/pleroma/web/common_api/common_api.ex @@ -7,6 +7,7 @@ defmodule Pleroma.Web.CommonAPI do alias Pleroma.ActivityExpiration alias Pleroma.Conversation.Participation alias Pleroma.FollowingRelationship + alias Pleroma.Notification alias Pleroma.Object alias Pleroma.ThreadMute alias Pleroma.User @@ -61,6 +62,7 @@ defmodule Pleroma.Web.CommonAPI 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], |