aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2019-05-21 17:12:38 +0300
committerrinpatch <rinpatch@sdf.org>2019-05-21 17:12:38 +0300
commit0407ffe75f7e91db240d491492eadf1385b1726b (patch)
treec7614cac74c73291ce52fb888711758f9451d64c
parentee682441415d7abe4acb2643e1d76fe8d78e80c1 (diff)
downloadpleroma-0407ffe75f7e91db240d491492eadf1385b1726b.tar.gz
Change validation error status codes to be more appropriate
-rw-r--r--lib/pleroma/web/mastodon_api/mastodon_api_controller.ex4
-rw-r--r--test/web/mastodon_api/mastodon_api_controller_test.exs8
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
index e2cab86f1..aef2abf0b 100644
--- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
+++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@@ -488,12 +488,12 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
case get_cached_status_or_post(conn, params) do
{:ignore, message} ->
conn
- |> put_status(401)
+ |> put_status(422)
|> json(%{error: message})
{:error, message} ->
conn
- |> put_status(401)
+ |> put_status(422)
|> json(%{error: message})
{_, activity} ->
diff --git a/test/web/mastodon_api/mastodon_api_controller_test.exs b/test/web/mastodon_api/mastodon_api_controller_test.exs
index e1df79ffb..4f332f83c 100644
--- a/test/web/mastodon_api/mastodon_api_controller_test.exs
+++ b/test/web/mastodon_api/mastodon_api_controller_test.exs
@@ -181,7 +181,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
"poll" => %{"options" => Enum.map(0..limit, fn _ -> "desu" end), "expires_in" => 1}
})
- %{"error" => error} = json_response(conn, 401)
+ %{"error" => error} = json_response(conn, 422)
assert error == "Poll can't contain more than #{limit} options"
end
@@ -200,7 +200,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
}
})
- %{"error" => error} = json_response(conn, 401)
+ %{"error" => error} = json_response(conn, 422)
assert error == "Poll options cannot be longer than #{limit} characters each"
end
@@ -219,7 +219,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
}
})
- %{"error" => error} = json_response(conn, 401)
+ %{"error" => error} = json_response(conn, 422)
assert error == "Expiration date is too soon"
end
@@ -238,7 +238,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do
}
})
- %{"error" => error} = json_response(conn, 401)
+ %{"error" => error} = json_response(conn, 422)
assert error == "Expiration date is too far in the future"
end
end