logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: 1dcdcd887132a4c7c07f6b8ef4ee8a7d83004867
parent: 3e5301ad5cf3d9805c0dc9ea8440992de160330b
Author: lambda <lain@soykaf.club>
Date:   Fri, 17 May 2019 10:07:51 +0000

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

Diffstat:

Mlib/pleroma/web/mastodon_api/views/account_view.ex2+-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/pleroma/web/mastodon_api/views/account_view.ex b/lib/pleroma/web/mastodon_api/views/account_view.ex @@ -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