aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorHaelwenn (lanodan) Monnier <contact@hacktivis.me>2019-05-17 07:34:52 +0200
committerHaelwenn (lanodan) Monnier <contact@hacktivis.me>2019-05-17 07:44:09 +0200
commit68c75a08e8593d41f496a362ab1be43d054c09d5 (patch)
treec5d3742b5473e71f5f4a275b19420c97b748de85 /lib
parent99f50bf3e8d3077216eecd101f16c31f46fdbf42 (diff)
downloadpleroma-68c75a08e8593d41f496a362ab1be43d054c09d5.tar.gz
MastoAPI account_view.ex: requested is false when following is true
Closes: https://git.pleroma.social/pleroma/pleroma/issues/903
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/mastodon_api/views/account_view.ex2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/mastodon_api/views/account_view.ex b/lib/pleroma/web/mastodon_api/views/account_view.ex
index 779b9a382..606a0f2ed 100644
--- 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 and !User.following?(target, user) do
follow_activity.data["state"] == "pending"
else
false