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

diff --git a/lib/pleroma/plugs/instance_static.ex b/lib/pleroma/plugs/instance_static.ex
deleted file mode 100644
index 0fb57e422..000000000
--- a/lib/pleroma/plugs/instance_static.ex
+++ /dev/null
@@ -1,53 +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.InstanceStatic do
-  require Pleroma.Constants
-
-  @moduledoc """
-  This is a shim to call `Plug.Static` but with runtime `from` configuration.
-
-  Mountpoints are defined directly in the module to avoid calling the configuration for every request including non-static ones.
-  """
-  @behaviour Plug
-
-  def file_path(path) do
-    instance_path =
-      Path.join(Pleroma.Config.get([:instance, :static_dir], "instance/static/"), path)
-
-    frontend_path = Pleroma.Plugs.FrontendStatic.file_path(path, :primary)
-
-    (File.exists?(instance_path) && instance_path) ||
-      (frontend_path && File.exists?(frontend_path) && frontend_path) ||
-      Path.join(Application.app_dir(:pleroma, "priv/static/"), path)
-  end
-
-  def init(opts) do
-    opts
-    |> Keyword.put(:from, "__unconfigured_instance_static_plug")
-    |> Plug.Static.init()
-  end
-
-  for only <- Pleroma.Constants.static_only_files() do
-    def call(%{request_path: "/" <> unquote(only) <> _} = conn, opts) do
-      call_static(
-        conn,
-        opts,
-        Pleroma.Config.get([:instance, :static_dir], "instance/static")
-      )
-    end
-  end
-
-  def call(conn, _) do
-    conn
-  end
-
-  defp call_static(conn, opts, from) do
-    opts =
-      opts
-      |> Map.put(:from, from)
-
-    Plug.Static.call(conn, opts)
-  end
-end