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

diff --git a/lib/pleroma/plugs/trailing_format_plug.ex b/lib/pleroma/plugs/trailing_format_plug.ex
deleted file mode 100644
index 8b4d5fc9f..000000000
--- a/lib/pleroma/plugs/trailing_format_plug.ex
+++ /dev/null
@@ -1,42 +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.Plugs.TrailingFormatPlug do
-  @moduledoc "Calls TrailingFormatPlug for specific paths. Ideally we would just do this in the router, but TrailingFormatPlug needs to be called before Plug.Parsers."
-
-  @behaviour Plug
-  @paths [
-    "/api/statusnet",
-    "/api/statuses",
-    "/api/qvitter",
-    "/api/search",
-    "/api/account",
-    "/api/friends",
-    "/api/mutes",
-    "/api/media",
-    "/api/favorites",
-    "/api/blocks",
-    "/api/friendships",
-    "/api/users",
-    "/users",
-    "/nodeinfo",
-    "/api/help",
-    "/api/externalprofile",
-    "/notice",
-    "/api/pleroma/emoji",
-    "/api/oauth_tokens"
-  ]
-
-  def init(opts) do
-    TrailingFormatPlug.init(opts)
-  end
-
-  for path <- @paths do
-    def call(%{request_path: unquote(path) <> _} = conn, opts) do
-      TrailingFormatPlug.call(conn, opts)
-    end
-  end
-
-  def call(conn, _opts), do: conn
-end