1 files changed, 4 insertions, 18 deletions
diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
index 11e7b3bdf..1d9d7f540 100644
--- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@ -43,24 +43,10 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
     |> json_reply(200, json)
   end
 
-  def user_timeline(conn, %{ "user_id" => user_id } = params) do
-    user = Repo.get(User, user_id)
-    conn = Map.merge(conn, %{assigns: %{user: user}})
-    params = Map.delete(params, "user_id")
-
-    friends_timeline(conn, params)
-  end
-
-  def user_timeline(conn, %{ "screen_name" => nickname} = params) do
-    user = Repo.get_by!(User, nickname: nickname)
-    conn = Map.merge(conn, %{assigns: %{user: user}})
-    params = Map.delete(params, "screen_name")
-
-    friends_timeline(conn, params)
-  end
-
-  def user_timeline(conn, params) do
-    friends_timeline(conn, params)
+  def user_timeline(%{assigns: %{user: user}} = conn, params) do
+    statuses = TwitterAPI.fetch_user_statuses(user, params)
+    conn
+    |> json_reply(200, statuses |> Poison.encode!)
   end
 
   def follow(%{assigns: %{user: user}} = conn, %{ "user_id" => followed_id }) do