Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/user-timeline

[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 fa26bb3e9f5c3f8ffa2818ff677e01c953d1c9f8..ae5cf0ad01abe27112449fd9e9d8d33020c0e484 100644 (file)
--- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@ -44,6 +44,12 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
     |> json_reply(200, json)
   end
 
+  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
     { :ok, user, follower, _activity } = TwitterAPI.follow(user, followed_id)