X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Ftwitter_api%2Ftwitter_api_controller.ex;h=fa26bb3e9f5c3f8ffa2818ff677e01c953d1c9f8;hb=5dac3727f10d65eea284da56fe4b0db5cab53f1f;hp=d574f1003ede1db62484525d9b4bcb87daffc4b0;hpb=30650e5bc610810d129bf02891a73ac11340710b;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 d574f1003..fa26bb3e9 100644
--- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@ -2,22 +2,34 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
   use Pleroma.Web, :controller
   alias Pleroma.Web.TwitterAPI.TwitterAPI
   alias Pleroma.Web.TwitterAPI.Representers.{UserRepresenter, ActivityRepresenter}
+  alias Pleroma.{Repo, Activity}
 
   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
@@ -33,23 +45,102 @@ 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
+    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)
+    { :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
 
-    response = follower |> UserRepresenter.to_json
+  def upload_json(conn, %{"media" => media}) do
+    response = TwitterAPI.upload(media, "json")
+    conn
+    |> json_reply(200, response)
+  end
+
+  def config(conn, _params) do
+    response = %{
+      site: %{
+        name: Pleroma.Web.base_url,
+        server: Pleroma.Web.base_url,
+        textlimit: -1
+      }
+    }
+    |> Poison.encode!
+
+    conn
+    |> json_reply(200, response)
+  end
+
+  def favorite(%{assigns: %{user: user}} = conn, %{"id" => id}) do
+    activity = Repo.get(Activity, id)
+    {:ok, status} = TwitterAPI.favorite(user, activity)
+    response = Poison.encode!(status)
+
+    conn
+    |> json_reply(200, response)
+  end
+
+  def unfavorite(%{assigns: %{user: user}} = conn, %{"id" => id}) do
+    activity = Repo.get(Activity, id)
+    {:ok, status} = TwitterAPI.unfavorite(user, activity)
+    response = Poison.encode!(status)
+
+    conn
+    |> json_reply(200, response)
+  end
+
+  def retweet(%{assigns: %{user: user}} = conn, %{"id" => id}) do
+    activity = Repo.get(Activity, id)
+    {:ok, status} = TwitterAPI.retweet(user, activity)
+    response = Poison.encode!(status)
 
     conn
     |> json_reply(200, response)
   end
 
+  def register(conn, params) do
+    with {:ok, user} <- TwitterAPI.register_user(params) do
+      conn
+      |> json_reply(200, Poison.encode!(user))
+    else
+      {:error, errors} ->
+      conn
+      |> json_reply(400, Poison.encode!(errors))
+    end
+  end
 
   defp json_reply(conn, status, json) do
     conn