Merge branch 'feature/remote-follow' into 'develop'

[akkoma] / lib / pleroma / web / twitter_api / twitter_api_controller.ex

diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
index 1a706029ae1b81fd92e30311b8f00bdc9b17d39a..5284a884746a671453aaee7a93b0aa8e5219dbf4 100644 (file)
--- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@ -10,7 +10,8 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
   require Logger
 
   def verify_credentials(%{assigns: %{user: user}} = conn, _params) do
-    render(conn, UserView, "show.json", %{user: user})
+    token = Phoenix.Token.sign(conn, "user socket", user.id)
+    render(conn, UserView, "show.json", %{user: user, token: token})
   end
 
   def status_update(%{assigns: %{user: user}} = conn, %{"status" => _} = status_data) do
@@ -262,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")