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, 40 deletions

diff --git a/lib/pleroma/web/media_proxy/invalidations/http.ex b/lib/pleroma/web/media_proxy/invalidations/http.ex
deleted file mode 100644
index bb81d8888..000000000
--- a/lib/pleroma/web/media_proxy/invalidations/http.ex
+++ /dev/null
@@ -1,40 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.Web.MediaProxy.Invalidation.Http do
-  @moduledoc false
-  @behaviour Pleroma.Web.MediaProxy.Invalidation
-
-  require Logger
-
-  @impl Pleroma.Web.MediaProxy.Invalidation
-  def purge(urls, opts \\ []) do
-    method = Keyword.get(opts, :method, :purge)
-    headers = Keyword.get(opts, :headers, [])
-    options = Keyword.get(opts, :options, [])
-
-    Logger.debug("Running cache purge: #{inspect(urls)}")
-
-    Enum.each(urls, fn url ->
-      with {:error, error} <- do_purge(method, url, headers, options) do
-        Logger.error("Error while cache purge: url - #{url}, error: #{inspect(error)}")
-      end
-    end)
-
-    {:ok, urls}
-  end
-
-  defp do_purge(method, url, headers, options) do
-    case Pleroma.HTTP.request(method, url, "", headers, options) do
-      {:ok, %{status: status} = env} when 400 <= status and status < 500 ->
-        {:error, env}
-
-      {:error, error} = error ->
-        error
-
-      _ ->
-        {:ok, "success"}
-    end
-  end
-end