Merge branch 'dtluna/pleroma-bugfix/deny-empty-posts' into develop

This commit is contained in:
Roger Braun 2017-04-25 12:01:00 +02:00
commit 5a3be8ad1b
2 changed files with 38 additions and 13 deletions

View File

@ -12,11 +12,23 @@ def verify_credentials(%{assigns: %{user: user}} = conn, _params) do
|> json_reply(200, response) |> json_reply(200, response)
end end
def status_update(%{assigns: %{user: user}} = conn, status_data) do 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) media_ids = extract_media_ids(status_data)
{:ok, activity} = TwitterAPI.create_status(user, Map.put(status_data, "media_ids", media_ids )) {:ok, activity} = TwitterAPI.create_status(user, Map.put(status_data, "media_ids", media_ids ))
conn conn
|> json_reply(200, ActivityRepresenter.to_json(activity, %{user: user})) |> 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 @@ def update_avatar(%{assigns: %{user: user}} = conn, params) 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 @@ defp json_reply(conn, status, json) 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} json = error_json(conn, error_message)
|> Poison.encode!
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

View File

@ -31,10 +31,21 @@ test "without valid credentials", %{conn: conn} do
end end
test "with credentials", %{conn: conn, user: user} do test "with credentials", %{conn: conn, user: user} do
conn = conn conn_with_creds = conn |> with_credentials(user.nickname, "test")
|> with_credentials(user.nickname, "test") request_path = "/api/statuses/update.json"
|> post("/api/statuses/update.json", %{ status: "Nice meme." })
error_response = %{"request" => request_path,
"error" => "Client must provide a 'status' parameter with a value."}
conn = conn_with_creds |> post(request_path)
assert json_response(conn, 400) == error_response
conn = conn_with_creds |> post(request_path, %{ status: "" })
assert json_response(conn, 400) == error_response
conn = conn_with_creds |> post(request_path, %{ status: " " })
assert json_response(conn, 400) == error_response
conn = conn_with_creds |> post(request_path, %{ status: "Nice meme." })
assert json_response(conn, 200) == ActivityRepresenter.to_map(Repo.one(Activity), %{user: user}) assert json_response(conn, 200) == ActivityRepresenter.to_map(Repo.one(Activity), %{user: user})
end end
end end
@ -139,7 +150,7 @@ test "with credentials", %{conn: conn, user: current_user} do
setup [:valid_user] setup [:valid_user]
test "without any params", %{conn: conn} do test "without any params", %{conn: conn} do
conn = get(conn, "/api/statuses/user_timeline.json") conn = get(conn, "/api/statuses/user_timeline.json")
assert json_response(conn, 400) == %{"error" => "You need to specify screen_name or user_id"} assert json_response(conn, 400) == %{"error" => "You need to specify screen_name or user_id", "request" => "/api/statuses/user_timeline.json"}
end end
test "with user_id", %{conn: conn} do test "with user_id", %{conn: conn} do