Commit 6b6bc943 authored by dtluna's avatar dtluna
Browse files

Merge branch 'bugfix/deny-empty-posts' of ssh.gitgud.io:dtluna/pleroma into...

Merge branch 'bugfix/deny-empty-posts' of ssh.gitgud.io:dtluna/pleroma into bugfix/deny-self-repeats
parents a3b9741a 1e379187
......@@ -12,13 +12,25 @@ def verify_credentials(%{assigns: %{user: user}} = conn, _params) do
|> json_reply(200, response)
end
def status_update(%{assigns: %{user: user}} = conn, status_data) do
def status_update(conn, %{"status" => ""} = _status_data) do
empty_status_reply(conn)
end
def status_update(%{assigns: %{user: user}} = conn, %{"status" => _status_text} = 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}))
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
defp extract_media_ids(status_data) do
with media_ids when not is_nil(media_ids) <- status_data["media_ids"],
split_ids <- String.split(media_ids, ","),
......@@ -182,7 +194,7 @@ def update_avatar(%{assigns: %{user: user}} = conn, params) do
end
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)
end
......@@ -193,9 +205,11 @@ defp json_reply(conn, status, json) do
end
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)
end
defp error_json(conn, error_message) do
%{"error" => error_message, "request" => conn.request_path} |> Poison.encode!
end
end
......@@ -31,10 +31,18 @@ test "without valid credentials", %{conn: conn} do
end
test "with credentials", %{conn: conn, user: user} do
conn = conn
|> with_credentials(user.nickname, "test")
|> post("/api/statuses/update.json", %{ status: "Nice meme." })
conn_with_creds = conn |> with_credentials(user.nickname, "test")
request_path = "/api/statuses/update.json"
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: "Nice meme." })
assert json_response(conn, 200) == ActivityRepresenter.to_map(Repo.one(Activity), %{user: user})
end
end
......@@ -139,7 +147,7 @@ test "with credentials", %{conn: conn, user: current_user} do
setup [:valid_user]
test "without any params", %{conn: conn} do
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
test "with user_id", %{conn: conn} do
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment