Merge branch 'bugfix/903-mastoapi-relationship-requested' into 'develop'

MastoAPI account_view.ex: requested is false when following is true

Closes #903

See merge request pleroma/pleroma!1169
This commit is contained in:
lambda 2019-05-17 10:07:51 +00:00
commit 1dcdcd8871

View File

@ -40,7 +40,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
follow_activity = Pleroma.Web.ActivityPub.Utils.fetch_latest_follow(user, target)
requested =
if follow_activity do
if follow_activity && !User.following?(target, user) do
follow_activity.data["state"] == "pending"
else
false