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

diff --git a/lib/pleroma/plugs/federating_plug.ex b/lib/pleroma/plugs/federating_plug.ex
deleted file mode 100644
index 09038f3c6..000000000
--- a/lib/pleroma/plugs/federating_plug.ex
+++ /dev/null
@@ -1,32 +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.FederatingPlug do
-  import Plug.Conn
-
-  def init(options) do
-    options
-  end
-
-  def call(conn, _opts) do
-    if federating?() do
-      conn
-    else
-      fail(conn)
-    end
-  end
-
-  def federating?, do: Pleroma.Config.get([:instance, :federating])
-
-  # Definition for the use in :if_func / :unless_func plug options
-  def federating?(_conn), do: federating?()
-
-  defp fail(conn) do
-    conn
-    |> put_status(404)
-    |> Phoenix.Controller.put_view(Pleroma.Web.ErrorView)
-    |> Phoenix.Controller.render("404.json")
-    |> halt()
-  end
-end