diff options
| author | lambda <lain@soykaf.club> | 2019-05-17 10:07:51 +0000 |
|---|---|---|
| committer | lambda <lain@soykaf.club> | 2019-05-17 10:07:51 +0000 |
| commit | 1dcdcd887132a4c7c07f6b8ef4ee8a7d83004867 (patch) | |
| tree | 608c8291038f417813c502833957dd125b9fe314 | |
| parent | 3e5301ad5cf3d9805c0dc9ea8440992de160330b (diff) | |
| parent | 46684db84d0583cb5d88f8fcbd6b970ef95c84de (diff) | |
| download | pleroma-1dcdcd887132a4c7c07f6b8ef4ee8a7d83004867.tar.gz pleroma-1dcdcd887132a4c7c07f6b8ef4ee8a7d83004867.zip | |
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
| -rw-r--r-- | lib/pleroma/web/mastodon_api/views/account_view.ex | 2 |
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..134c07b7e 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 && !User.following?(target, user) do follow_activity.data["state"] == "pending" else false |