Don't check limit twice in TwitterAPIController.
authorRoger Braun <roger@rogerbraun.net>
Sat, 16 Sep 2017 13:47:07 +0000 (15:47 +0200)
committerRoger Braun <roger@rogerbraun.net>
Sat, 16 Sep 2017 13:47:07 +0000 (15:47 +0200)
lib/pleroma/web/twitter_api/twitter_api_controller.ex

index bca74850cf83913923ad9acb09fa55349c4834d4..5297e45c6cbd902334ecafea322aaaa409cac6a8 100644 (file)
@@ -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