Change user.discoverable field to user.is_discoverable

[akkoma] / lib / pleroma / plugs / idempotency_plug.ex

diff --git a/lib/pleroma/plugs/idempotency_plug.ex b/lib/pleroma/plugs/idempotency_plug.ex
index 442573d603617911cb9af522bbcada910e699b4e..f413970751bc4361423af16a7cfe90fb8fca74dc 100644 (file)
--- a/lib/pleroma/plugs/idempotency_plug.ex
+++ b/lib/pleroma/plugs/idempotency_plug.ex
@@ -1,5 +1,5 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Plugs.IdempotencyPlug do
@@ -11,7 +11,9 @@ defmodule Pleroma.Plugs.IdempotencyPlug do
   @impl true
   def init(opts), do: opts
 
-  # Sending idempotency keys in `GET` and `DELETE` requests has no effect and should be avoided, as these requests are idempotent by definition.
+  # Sending idempotency keys in `GET` and `DELETE` requests has no effect
+  # and should be avoided, as these requests are idempotent by definition.
+
   @impl true
   def call(%{method: method} = conn, _) when method in ["POST", "PUT", "PATCH"] do
     case get_req_header(conn, "idempotency-key") do
@@ -27,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)