diff options
author | eal <eal@waifu.club> | 2017-12-18 16:23:04 +0200 |
---|---|---|
committer | eal <eal@waifu.club> | 2017-12-18 16:37:26 +0200 |
commit | 1969773fb4a8a6b2cf4354cd4e879bfe6c08dca6 (patch) | |
tree | 3d4fea7c0550bda3d2b0555ba97c2a6d58b0a9de /lib/pleroma/web/twitter_api/twitter_api_controller.ex | |
parent | 9223038319f0281f104fb9bb85c0cb8f6e52984a (diff) | |
download | pleroma-1969773fb4a8a6b2cf4354cd4e879bfe6c08dca6.tar.gz |
Fix follower/following lists.
Add tests.
Diffstat (limited to 'lib/pleroma/web/twitter_api/twitter_api_controller.ex')
-rw-r--r-- | lib/pleroma/web/twitter_api/twitter_api_controller.ex | 10 |
1 files changed, 6 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 73d96c73d..5284a8847 100644 --- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex +++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex @@ -263,16 +263,18 @@ defmodule Pleroma.Web.TwitterAPI.Controller do end end - def followers(%{assigns: %{user: user}} = conn, _params) do - with {:ok, followers} <- User.get_followers(user) do + def followers(conn, params) do + 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}) else _e -> bad_request_reply(conn, "Can't get followers") end end - def friends(%{assigns: %{user: user}} = conn, _params) do - with {:ok, friends} <- User.get_friends(user) do + def friends(conn, params) do + 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}) else _e -> bad_request_reply(conn, "Can't get friends") |