Merge branch 'release/2.2.0' into 'stable'v2.2.0

Release/2.2.0

See merge request pleroma/secteam/pleroma!19

1 files changed, 0 insertions, 50 deletions

diff --git a/lib/pleroma/plugs/rate_limiter/limiter_supervisor.ex b/lib/pleroma/plugs/rate_limiter/limiter_supervisor.ex
deleted file mode 100644
index 884268d96..000000000
--- a/lib/pleroma/plugs/rate_limiter/limiter_supervisor.ex
+++ /dev/null
@@ -1,50 +0,0 @@
-defmodule Pleroma.Plugs.RateLimiter.LimiterSupervisor do
-  use DynamicSupervisor
-
-  import Cachex.Spec
-
-  def start_link(init_arg) do
-    DynamicSupervisor.start_link(__MODULE__, init_arg, name: __MODULE__)
-  end
-
-  def add_or_return_limiter(limiter_name, expiration) do
-    result =
-      DynamicSupervisor.start_child(
-        __MODULE__,
-        %{
-          id: String.to_atom("rl_#{limiter_name}"),
-          start:
-            {Cachex, :start_link,
-             [
-               limiter_name,
-               [
-                 expiration:
-                   expiration(
-                     default: expiration,
-                     interval: check_interval(expiration),
-                     lazy: true
-                   )
-               ]
-             ]}
-        }
-      )
-
-    case result do
-      {:ok, _pid} = result -> result
-      {:error, {:already_started, pid}} -> {:ok, pid}
-      _ -> result
-    end
-  end
-
-  @impl true
-  def init(_init_arg) do
-    DynamicSupervisor.init(strategy: :one_for_one)
-  end
-
-  defp check_interval(exp) do
-    (exp / 2)
-    |> Kernel.trunc()
-    |> Kernel.min(5000)
-    |> Kernel.max(1)
-  end
-end