aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/plugs/idempotency_plug.ex8
-rw-r--r--lib/pleroma/web/mastodon_api/mastodon_api_controller.ex2
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/pleroma/plugs/idempotency_plug.ex b/lib/pleroma/plugs/idempotency_plug.ex
index 7c06be9ea..e99c5d279 100644
--- a/lib/pleroma/plugs/idempotency_plug.ex
+++ b/lib/pleroma/plugs/idempotency_plug.ex
@@ -29,16 +29,16 @@ defmodule Pleroma.Plugs.IdempotencyPlug do
{:ok, nil} ->
cache_resposnse(conn, key)
- {atom, message} when atom in [:ignore, :error] ->
- render_error(conn, message)
-
{:ok, record} ->
send_cached(conn, key, record)
+
+ {atom, message} when atom in [:ignore, :error] ->
+ render_error(conn, message)
end
end
defp cache_resposnse(conn, key) do
- Plug.Conn.register_before_send(conn, fn conn ->
+ register_before_send(conn, fn conn ->
[request_id] = get_resp_header(conn, "x-request-id")
content_type = get_content_type(conn)
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
index d2f08d503..7cdba4cc0 100644
--- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
+++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@@ -564,7 +564,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
case CommonAPI.post(user, params) do
{:error, message} ->
conn
- |> put_status(422)
+ |> put_status(:unprocessable_entity)
|> json(%{error: message})
{:ok, activity} ->