Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/follow...

diff --cc lib/pleroma/web/twitter_api/twitter_api.ex
Simple merge

diff --cc lib/pleroma/web/twitter_api/twitter_api_controller.ex
index 3d6487396d7c9dc6ff002748c83bbe024a9e8bf7,8ea54852dd6f90eb2bb380f9835c4bde1413870c..4d21ce9d36334d2c2f2a08e34a5272b1344efdeb
--- 1/lib/pleroma/web/twitter_api/twitter_api_controller.ex
--- 2/lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@@ -57,8 -57,16 +57,16 @@@ defmodule Pleroma.Web.TwitterAPI.Contro
      end
    end
  
 -  def follow(%{assigns: %{user: user}} = conn, %{ "user_id" => followed_id }) do
 -    case TwitterAPI.follow(user, followed_id) do
+   def mentions_timeline(%{assigns: %{user: user}} = conn, params) do
+     statuses = TwitterAPI.fetch_mentions(user, params)
+     {:ok, json} = Poison.encode(statuses)
+ 
+     conn
+     |> json_reply(200, json)
+   end
+ 
 +  def follow(%{assigns: %{user: user}} = conn, params) do
 +    case TwitterAPI.follow(user, params) do
        { :ok, user, followed, _activity } ->
          response = followed |> UserRepresenter.to_json(%{for: user})
          conn

diff --cc test/web/twitter_api/twitter_api_test.exs
Simple merge