diff options
| author | lain <lain@soykaf.club> | 2020-04-15 14:41:43 +0200 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-04-15 14:41:43 +0200 |
| commit | 44bfb491eae00d541e6d11c8b52b5de5bc0bd34e (patch) | |
| tree | 0fae87b11ceb4696075927c7f77228e59bb6926c /lib/pleroma/web/common_api/common_api.ex | |
| parent | 64c78581fe397b6d9356c52cf3f43becd2ff3b4e (diff) | |
| parent | ad8630b95a691d01ec49344fd1a7578860728d63 (diff) | |
| download | pleroma-44bfb491eae00d541e6d11c8b52b5de5bc0bd34e.tar.gz | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
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 39e15adbf..2f13daf0c 100644 --- a/lib/pleroma/web/common_api/common_api.ex +++ b/lib/pleroma/web/common_api/common_api.ex @@ -68,7 +68,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], @@ -83,7 +83,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], |