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=088439f488fbfca4fee55bb5107a2525790fd40e;hpb=e2e0cd75b77778cb7adf911cf279d0ccc008dab1;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 088439f48..8163897e7 100644
--- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@ -4,20 +4,31 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
   alias Pleroma.Web.TwitterAPI.Representers.{UserRepresenter, ActivityRepresenter}
 
   def verify_credentials(%{assigns: %{user: user}} = conn, _params) do
-    response = user |> UserRepresenter.to_json
+    response = user |> UserRepresenter.to_json(%{for: user})
 
     conn
     |> json_reply(200, response)
   end
 
   def status_update(%{assigns: %{user: user}} = conn, status_data) do
-    {:ok, activity} = TwitterAPI.create_status(user, status_data)
+    media_ids = extract_media_ids(status_data)
+    {: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
 
-  def public_timeline(conn, params) do
-    statuses = TwitterAPI.fetch_public_statuses(params)
+  defp extract_media_ids(status_data) do
+    with media_ids when not is_nil(media_ids) <- status_data["media_ids"],
+         split_ids <- String.split(media_ids, ","),
+         clean_ids <- Enum.reject(split_ids, fn (id) -> String.length(id) == 0 end)
+      do
+        clean_ids
+      else _e -> []
+    end
+  end
+
+  def public_timeline(%{assigns: %{user: user}} = conn, params) do
+    statuses = TwitterAPI.fetch_public_statuses(user, params)
     {:ok, json} = Poison.encode(statuses)
 
     conn
@@ -32,6 +43,50 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
     |> json_reply(200, json)
   end
 
+  def follow(%{assigns: %{user: user}} = conn, %{ "user_id" => followed_id }) do
+    { :ok, _user, follower, _activity } = TwitterAPI.follow(user, followed_id)
+
+    response = follower |> UserRepresenter.to_json(%{for: user})
+
+    conn
+    |> json_reply(200, response)
+  end
+
+  def unfollow(%{assigns: %{user: user}} = conn, %{ "user_id" => followed_id }) do
+    { :ok, user, follower } = TwitterAPI.unfollow(user, followed_id)
+
+    response = follower |> UserRepresenter.to_json(%{for: user})
+
+    conn
+    |> json_reply(200, response)
+  end
+
+  def fetch_status(%{assigns: %{user: user}} = conn, %{ "id" => id }) do
+    response = TwitterAPI.fetch_status(user, id) |> Poison.encode!
+
+    conn
+    |> json_reply(200, response)
+  end
+
+  def fetch_conversation(%{assigns: %{user: user}} = conn, %{ "id" => id }) do
+    id = String.to_integer(id)
+    response = TwitterAPI.fetch_conversation(user, id) |> Poison.encode!
+
+    conn
+    |> json_reply(200, response)
+  end
+
+  def upload(conn, %{"media" => media}) do
+    response = TwitterAPI.upload(media)
+    conn
+    |> put_resp_content_type("application/atom+xml")
+    |> 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")