commit: c17c8ce36d35db03a007a264cc2e507afa9b803e
parent: 03952a27600b0947c415a72655262eaa37804d23
Author: Roger Braun <roger@rogerbraun.net>
Date: Sat, 16 Sep 2017 15:47:07 +0200
Don't check limit twice in TwitterAPIController.
Diffstat:
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git 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