diff options
| author | Roman Chvanikov <chvanikoff@pm.me> | 2020-05-01 01:38:49 +0300 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@pm.me> | 2020-05-01 01:38:49 +0300 |
| commit | 5dae50bbb19be8e93279fd95f49d0fd246e03565 (patch) | |
| tree | 1c801667b4a9cd6688b92d5709ab86c948510669 /lib/pleroma/web/common_api/common_api.ex | |
| parent | 59f2c853079f281aecc5a7c34257239fb9a9ea0b (diff) | |
| parent | 0dd863f8f53d30d37e35d4ec2c4e34d09a266a85 (diff) | |
| download | pleroma-5dae50bbb19be8e93279fd95f49d0fd246e03565.tar.gz | |
merge develop
Diffstat (limited to 'lib/pleroma/web/common_api/common_api.ex')
| -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 d1efe0c36..4112e441a 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], |