aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authoreal <eal@waifu.club>2018-05-31 15:27:42 +0300
committereal <eal@waifu.club>2018-05-31 15:27:42 +0300
commit935e544e19a2dde70a5e1cc9d8fdc1cf49da8517 (patch)
treec9deca1fb54a631d29c17dd6ee598e5b76ae6b36 /lib
parent196d36a7d5e94ea2b494c5910a263da20c985e66 (diff)
downloadpleroma-935e544e19a2dde70a5e1cc9d8fdc1cf49da8517.tar.gz
TwitterAPI: fix "Follows you" being shown for the wrong user.
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/twitter_api/twitter_api_controller.ex8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
index c2b0bb01d..320f2fcf4 100644
--- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@ -309,18 +309,18 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
end
def followers(conn, params) do
- with {:ok, user} <- TwitterAPI.get_user(conn.assigns.user, params),
+ with {:ok, user} <- TwitterAPI.get_user(conn.assigns[:user], params),
{:ok, followers} <- User.get_followers(user) do
- render(conn, UserView, "index.json", %{users: followers, for: user})
+ render(conn, UserView, "index.json", %{users: followers, for: conn.assigns[:user]})
else
_e -> bad_request_reply(conn, "Can't get followers")
end
end
def friends(conn, params) do
- with {:ok, user} <- TwitterAPI.get_user(conn.assigns.user, params),
+ with {:ok, user} <- TwitterAPI.get_user(conn.assigns[:user], params),
{:ok, friends} <- User.get_friends(user) do
- render(conn, UserView, "index.json", %{users: friends, for: user})
+ render(conn, UserView, "index.json", %{users: friends, for: conn.assigns[:user]})
else
_e -> bad_request_reply(conn, "Can't get friends")
end