aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authoreal <eal@waifu.club>2017-11-08 19:13:03 +0200
committereal <eal@waifu.club>2017-11-08 19:13:03 +0200
commitf7fc048aeb42ffbfce9f278b362c3d4766a4e9a2 (patch)
tree5b80e6a521d438767b8e0492abe08cd62bbac7f2 /lib
parent8bbbfd72aad7eccf0914019affbaa060a41b96b2 (diff)
downloadpleroma-f7fc048aeb42ffbfce9f278b362c3d4766a4e9a2.tar.gz
TwitterAPI user view: add follows_you.
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/twitter_api/views/user_view.ex16
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/pleroma/web/twitter_api/views/user_view.ex b/lib/pleroma/web/twitter_api/views/user_view.ex
index d33c054f3..6c5676c04 100644
--- a/lib/pleroma/web/twitter_api/views/user_view.ex
+++ b/lib/pleroma/web/twitter_api/views/user_view.ex
@@ -16,15 +16,14 @@ defmodule Pleroma.Web.TwitterAPI.UserView do
def render("user.json", %{user: user = %User{}} = assigns) do
image = User.avatar_url(user)
- following = if assigns[:for] do
- User.following?(assigns[:for], user)
+ {following, follows_you, statusnet_blocking} = if assigns[:for] do
+ {
+ User.following?(assigns[:for], user),
+ User.following?(user, assigns[:for]),
+ User.blocks?(assigns[:for], user)
+ }
else
- false
- end
- statusnet_blocking = if assigns[:for] do
- User.blocks?(assigns[:for], user)
- else
- false
+ {false, false, false}
end
user_info = User.get_cached_user_info(user)
@@ -35,6 +34,7 @@ defmodule Pleroma.Web.TwitterAPI.UserView do
"favourites_count" => 0,
"followers_count" => user_info[:follower_count],
"following" => following,
+ "follows_you" => follows_you,
"statusnet_blocking" => statusnet_blocking,
"friends_count" => user_info[:following_count],
"id" => user.id,