|
@@ -12,11 +12,23 @@ defmodule Pleroma.Web.TwitterAPI.Controller do |
|
|
|> json_reply(200, response) |
|
|
|> json_reply(200, response) |
|
|
end |
|
|
end |
|
|
|
|
|
|
|
|
def status_update(%{assigns: %{user: user}} = conn, status_data) do |
|
|
|
|
|
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})) |
|
|
|
|
|
|
|
|
def status_update(%{assigns: %{user: user}} = conn, %{"status" => status_text} = status_data) do |
|
|
|
|
|
if status_text |> String.trim |> String.length != 0 do |
|
|
|
|
|
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})) |
|
|
|
|
|
else |
|
|
|
|
|
empty_status_reply(conn) |
|
|
|
|
|
end |
|
|
|
|
|
end |
|
|
|
|
|
|
|
|
|
|
|
def status_update(conn, _status_data) do |
|
|
|
|
|
empty_status_reply(conn) |
|
|
|
|
|
end |
|
|
|
|
|
|
|
|
|
|
|
defp empty_status_reply(conn) do |
|
|
|
|
|
bad_request_reply(conn, "Client must provide a 'status' parameter with a value.") |
|
|
end |
|
|
end |
|
|
|
|
|
|
|
|
defp extract_media_ids(status_data) do |
|
|
defp extract_media_ids(status_data) do |
|
@@ -182,7 +194,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do |
|
|
end |
|
|
end |
|
|
|
|
|
|
|
|
defp bad_request_reply(conn, error_message) do |
|
|
defp bad_request_reply(conn, error_message) do |
|
|
json = Poison.encode!(%{"error" => error_message}) |
|
|
|
|
|
|
|
|
json = error_json(conn, error_message) |
|
|
json_reply(conn, 400, json) |
|
|
json_reply(conn, 400, json) |
|
|
end |
|
|
end |
|
|
|
|
|
|
|
@@ -193,9 +205,11 @@ defmodule Pleroma.Web.TwitterAPI.Controller do |
|
|
end |
|
|
end |
|
|
|
|
|
|
|
|
defp forbidden_json_reply(conn, error_message) do |
|
|
defp forbidden_json_reply(conn, error_message) do |
|
|
json = %{"error" => error_message, "request" => conn.request_path} |
|
|
|
|
|
|> Poison.encode! |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
json = error_json(conn, error_message) |
|
|
json_reply(conn, 403, json) |
|
|
json_reply(conn, 403, json) |
|
|
end |
|
|
end |
|
|
|
|
|
|
|
|
|
|
|
defp error_json(conn, error_message) do |
|
|
|
|
|
%{"error" => error_message, "request" => conn.request_path} |> Poison.encode! |
|
|
|
|
|
end |
|
|
end |
|
|
end |