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=bca74850cf83913923ad9acb09fa55349c4834d4;hpb=5d1f8dcd1c3137976e382bf99058e202ed62477e;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 bca74850c..6154d5ad7 100644
--- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@ -14,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
 
@@ -213,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