projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Merge branch 'streamer-refactoring' into 'develop'"
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
views
/
account_view.ex
diff --git
a/lib/pleroma/web/mastodon_api/views/account_view.ex
b/lib/pleroma/web/mastodon_api/views/account_view.ex
index a2297a8e84b363f95ee740a4ec194e186af734a4..169116d0d421bae977c5f0abb00d319bb574e739 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/views/account_view.ex
+++ b/
lib/pleroma/web/mastodon_api/views/account_view.ex
@@
-37,11
+37,11
@@
defmodule Pleroma.Web.MastodonAPI.AccountView do
end
def render("relationship.json", %{user: %User{} = user, target: %User{} = target}) do
end
def render("relationship.json", %{user: %User{} = user, target: %User{} = target}) do
- follow_
activity = Pleroma.Web.ActivityPub.Utils.fetch_latest_follow
(user, target)
+ follow_
state = User.get_cached_follow_state
(user, target)
requested =
requested =
- if follow_
activity && !User.following?(target, user
) do
- follow_
activity.data["state"]
== "pending"
+ if follow_
state && !User.following?(user, target
) do
+ follow_
state
== "pending"
else
false
end
else
false
end