diff options
author | Mark Felder <feld@FreeBSD.org> | 2019-10-30 17:51:15 -0500 |
---|---|---|
committer | Mark Felder <feld@FreeBSD.org> | 2019-10-30 17:51:15 -0500 |
commit | fcea6a9d2c7ae3223a6ec5038869a68ec618cb77 (patch) | |
tree | a2cb03d2c00acc2d63bb448613d7b40817d1d7c9 /lib/pleroma/web/common_api/common_api.ex | |
parent | ae59b38203b5358ddbf7f2cc5e2cbc816d171452 (diff) | |
parent | 9b40e5f563cc3478bb1d619278b9c8e7d689f121 (diff) | |
download | pleroma-fcea6a9d2c7ae3223a6ec5038869a68ec618cb77.tar.gz |
Merge branch 'develop' into feature/fast_sanitize
Diffstat (limited to 'lib/pleroma/web/common_api/common_api.ex')
-rw-r--r-- | lib/pleroma/web/common_api/common_api.ex | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex index 449b808b5..e57345621 100644 --- a/lib/pleroma/web/common_api/common_api.ex +++ b/lib/pleroma/web/common_api/common_api.ex @@ -6,6 +6,7 @@ defmodule Pleroma.Web.CommonAPI do alias Pleroma.Activity alias Pleroma.ActivityExpiration alias Pleroma.Conversation.Participation + alias Pleroma.FollowingRelationship alias Pleroma.Object alias Pleroma.ThreadMute alias Pleroma.User @@ -40,6 +41,7 @@ defmodule Pleroma.Web.CommonAPI do with {:ok, follower} <- User.follow(follower, followed), %Activity{} = follow_activity <- Utils.fetch_latest_follow(follower, followed), {:ok, follow_activity} <- Utils.update_follow_state_for_all(follow_activity, "accept"), + {:ok, _relationship} <- FollowingRelationship.update(follower, followed, "accept"), {:ok, _activity} <- ActivityPub.accept(%{ to: [follower.ap_id], @@ -54,6 +56,7 @@ 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, "reject"), {:ok, _activity} <- ActivityPub.reject(%{ to: [follower.ap_id], |