From 889a9c3a3f427f5fdf2708fd281c1218d08b8fd7 Mon Sep 17 00:00:00 2001
From: Egor Kislitsyn <egor@kislitsyn.com>
Date: Thu, 27 Jun 2019 01:53:36 +0700
Subject: [PATCH] Polish IdempotencyPlug

---
 lib/pleroma/plugs/idempotency_plug.ex          |  8 ++++----
 .../mastodon_api/mastodon_api_controller.ex    |  2 +-
 test/plugs/idempotency_plug_test.exs           | 18 +++++++++---------
 3 files changed, 14 insertions(+), 14 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} ->
diff --git a/test/plugs/idempotency_plug_test.exs b/test/plugs/idempotency_plug_test.exs
index aebc463e9..ac1735f13 100644
--- a/test/plugs/idempotency_plug_test.exs
+++ b/test/plugs/idempotency_plug_test.exs
@@ -24,7 +24,7 @@ defmodule Pleroma.Plugs.IdempotencyPlugTest do
     |> IdempotencyPlug.call([])
     |> Conn.send_resp(status, body)
 
-    conn2 =
+    conn =
       :post
       |> conn("/cofe")
       |> put_req_header("idempotency-key", key)
@@ -33,17 +33,17 @@ defmodule Pleroma.Plugs.IdempotencyPlugTest do
       |> IdempotencyPlug.call([])
 
     assert_raise Conn.AlreadySentError, fn ->
-      Conn.send_resp(conn2, :im_a_teapot, "no cofe")
+      Conn.send_resp(conn, :im_a_teapot, "no cofe")
     end
 
-    assert conn2.resp_body == body
-    assert conn2.status == status
+    assert conn.resp_body == body
+    assert conn.status == status
 
-    assert [^second_request_id] = Conn.get_resp_header(conn2, "x-request-id")
-    assert [^orig_request_id] = Conn.get_resp_header(conn2, "x-original-request-id")
-    assert [^key] = Conn.get_resp_header(conn2, "idempotency-key")
-    assert ["true"] = Conn.get_resp_header(conn2, "idempotent-replayed")
-    assert ["application/json; charset=utf-8"] = Conn.get_resp_header(conn2, "content-type")
+    assert [^second_request_id] = Conn.get_resp_header(conn, "x-request-id")
+    assert [^orig_request_id] = Conn.get_resp_header(conn, "x-original-request-id")
+    assert [^key] = Conn.get_resp_header(conn, "idempotency-key")
+    assert ["true"] = Conn.get_resp_header(conn, "idempotent-replayed")
+    assert ["application/json; charset=utf-8"] = Conn.get_resp_header(conn, "content-type")
   end
 
   test "pass conn downstream if the cache not found" do
-- 
2.45.2