X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Ftwitter_api%2Ftwitter_api_controller.ex;h=6154d5ad76b220ed1ca40b922bd19c9224389a0d;hb=b4f055b60416986220d905bbf688f8417cd8a270;hp=3580e48d29f2a8c994d9d73b993f42b91af2b558;hpb=678f572144bfd861793c0b72061b04cdb9b7c991;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 3580e48d2..6154d5ad7 100644
--- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@ -2,7 +2,8 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
   use Pleroma.Web, :controller
   alias Pleroma.Web.TwitterAPI.{TwitterAPI, UserView}
   alias Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter
-  alias Pleroma.{Repo, Activity, User}
+  alias Pleroma.Web.CommonAPI
+  alias Pleroma.{Repo, Activity, User, Object}
   alias Pleroma.Web.ActivityPub.ActivityPub
   alias Ecto.Changeset
 
@@ -13,14 +14,12 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
   end
 
   def status_update(%{assigns: %{user: user}} = conn, %{"status" => status_text} = status_data) do
-    l = status_text |> String.trim |> String.length
-    if l > 0 && l < 5000 do
-      media_ids = extract_media_ids(status_data)
-      {:ok, activity} = TwitterAPI.create_status(user, Map.put(status_data, "media_ids",  media_ids))
+    with media_ids <- extract_media_ids(status_data),
+         {:ok, activity} <- TwitterAPI.create_status(user, Map.put(status_data, "media_ids",  media_ids)) do
       conn
-      |> json_reply(200, ActivityRepresenter.to_json(activity, %{user: user}))
+      |> json(ActivityRepresenter.to_map(activity, %{user: user}))
     else
-      empty_status_reply(conn)
+      _ -> empty_status_reply(conn)
     end
   end
 
@@ -94,6 +93,14 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
     end
   end
 
+  def delete_post(%{assigns: %{user: user}} = conn, %{"id" => id}) do
+    with {:ok, delete} <- CommonAPI.delete(id, user) do
+      json = ActivityRepresenter.to_json(delete, %{user: user, for: user})
+      conn
+      |> json_reply(200, json)
+    end
+  end
+
   def unfollow(%{assigns: %{user: user}} = conn, params) do
     case TwitterAPI.unfollow(user, params) do
       {:ok, user, unfollowed} ->
@@ -140,40 +147,25 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
   end
 
   def favorite(%{assigns: %{user: user}} = conn, %{"id" => id}) do
-    activity = get_by_id_or_ap_id(id)
-    {:ok, status} = TwitterAPI.favorite(user, activity)
-    response = Poison.encode!(status)
-
-    conn
-    |> json_reply(200, response)
+    with {:ok, status} <- TwitterAPI.fav(user, id) do
+      json(conn, status)
+    end
   end
 
   def unfavorite(%{assigns: %{user: user}} = conn, %{"id" => id}) do
-    activity = get_by_id_or_ap_id(id)
-    {:ok, status} = TwitterAPI.unfavorite(user, activity)
-    response = Poison.encode!(status)
-
-    conn
-    |> json_reply(200, response)
+    with {:ok, status} <- TwitterAPI.unfav(user, id) do
+      json(conn, status)
+    end
   end
 
   def retweet(%{assigns: %{user: user}} = conn, %{"id" => id}) do
-    activity = get_by_id_or_ap_id(id)
-    if activity.data["actor"] == user.ap_id do
-      bad_request_reply(conn, "You cannot repeat your own notice.")
-    else
-      {:ok, status} = TwitterAPI.retweet(user, activity)
-      response = Poison.encode!(status)
-
-      conn
-
-      |> json_reply(200, response)
+    with {:ok, status} <- TwitterAPI.repeat(user, id) do
+      json(conn, status)
     end
   end
 
   def register(conn, params) do
     with {:ok, user} <- TwitterAPI.register_user(params) do
-
       render(conn, UserView, "show.json", %{user: user})
     else
       {:error, errors} ->
@@ -219,6 +211,11 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
          response <- Poison.encode!(user_map) do
       conn
       |> json_reply(200, response)
+    else
+      _e ->
+        conn
+        |> put_status(404)
+        |> json(%{error: "Can't find user"})
     end
   end
 
@@ -269,6 +266,11 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
     end
   end
 
+  def search(%{assigns: %{user: user}} = conn, %{"q" => query} = params) do
+    conn
+    |> json(TwitterAPI.search(user, params))
+  end
+
   defp bad_request_reply(conn, error_message) do
     json = error_json(conn, error_message)
     json_reply(conn, 400, json)