X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Ftwitter_api%2Ftwitter_api_controller.ex;h=8163897e775b251514efdf5198dbd9cadd5a4aa5;hb=9383c0aada01ac1b4898aab02798ea3f9a9ea5a5;hp=2154f34f7de828aa55c2b385ef1f6fd6f1e1fc28;hpb=73df2f8e5e2d0e2b125df8848c2dd7f2a73f1c03;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 2154f34f7..8163897e7 100644
--- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@ -12,7 +12,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
 
   def status_update(%{assigns: %{user: user}} = conn, status_data) do
     media_ids = extract_media_ids(status_data)
-    {:ok, activity} = TwitterAPI.create_status(user, %{ "status" => status_data["status"], "media_ids" => media_ids })
+    {:ok, activity} = TwitterAPI.create_status(user, Map.put(status_data, "media_ids",  media_ids ))
     conn
     |> json_reply(200, ActivityRepresenter.to_json(activity, %{user: user}))
   end
@@ -44,7 +44,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
   end
 
   def follow(%{assigns: %{user: user}} = conn, %{ "user_id" => followed_id }) do
-    { :ok, _user, follower } = TwitterAPI.follow(user, followed_id)
+    { :ok, _user, follower, _activity } = TwitterAPI.follow(user, followed_id)
 
     response = follower |> UserRepresenter.to_json(%{for: user})
 
@@ -83,6 +83,10 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
     |> send_resp(200, response)
   end
 
+  def help_test(conn, _) do
+    conn |> json_reply(200, Poison.encode!("ok"))
+  end
+
   defp json_reply(conn, status, json) do
     conn
     |> put_resp_content_type("application/json")