X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Ftwitter_api%2Ftwitter_api_controller.ex;h=e319cfb8cc29ffe59ccbb8b676159fa49d69769a;hb=ed3403ad8be255480d7e41f899d74fe9e5ef3f84;hp=887474a2350c0c363d95765a5e3080c73cf90b0f;hpb=3533bf7eacaceb493bd4bef4ae5625f7c99021b9;p=akkoma

diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
index 887474a23..e319cfb8c 100644
--- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@ -65,6 +65,19 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
     |> json_reply(200, json)
   end
 
+  def show_user(conn, params) do
+    with {:ok, shown} <- TwitterAPI.get_user(params) do
+      if user = conn.assigns.user do
+        render conn, UserView, "show.json", %{user: shown, for: user}
+      else
+        render conn, UserView, "show.json", %{user: shown}
+      end
+    else
+      {:error, msg} ->
+        bad_request_reply(conn, msg)
+    end
+  end
+
   def user_timeline(%{assigns: %{user: user}} = conn, params) do
     case TwitterAPI.get_user(user, params) do
       {:ok, target_user} ->
@@ -270,12 +283,16 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
       ids = friends
       |> Enum.map(fn x -> x.id end)
       |> Poison.encode!
+
       json(conn, ids)
     else
       _e -> bad_request_reply(conn, "Can't get friends")
     end
   end
 
+  def empty_array(conn, _params) do
+    json(conn, Poison.encode!([]))
+  end
 
   def update_profile(%{assigns: %{user: user}} = conn, params) do
     params = if bio = params["description"] do