diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-04-16 21:28:52 +0300 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-04-16 21:28:52 +0300 |
| commit | 942d7467ca28c898f914539ae85ea3044c36ebbc (patch) | |
| tree | 03d909dfcf5974838919076c6ae994515b0c1f84 /lib/pleroma/web/common_api/common_api.ex | |
| parent | e89078ac2a27bb0a833c982dbb5eef63ddea3cc0 (diff) | |
| parent | 252528a4b9ca3a5d92f1676c44989ad7d8777de1 (diff) | |
| download | pleroma-942d7467ca28c898f914539ae85ea3044c36ebbc.tar.gz | |
Merge branch 'develop' into features/remove-user-source_data
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 952a8d8cb..f50a909aa 100644 --- a/lib/pleroma/web/common_api/common_api.ex +++ b/lib/pleroma/web/common_api/common_api.ex @@ -45,7 +45,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, _relationship} <- FollowingRelationship.update(follower, followed, :follow_accept), {:ok, _activity} <- ActivityPub.accept(%{ to: [follower.ap_id], @@ -60,7 +60,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, _relationship} <- FollowingRelationship.update(follower, followed, :follow_reject), {:ok, _activity} <- ActivityPub.reject(%{ to: [follower.ap_id], |