X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fplugs%2Fstatic_fe_plug.ex;h=143665c71b0756c2913d578fdaea3751bdbb49c9;hb=fa0fa4552f186d03abb59aba22d3f4eac1654e1e;hp=dcbabc9df00ff8ee07354afe39d52cca0359043e;hpb=e8bee35578fbbc442657baa4dee0047906b247a9;p=akkoma
diff --git a/lib/pleroma/plugs/static_fe_plug.ex b/lib/pleroma/plugs/static_fe_plug.ex
index dcbabc9df..143665c71 100644
--- a/lib/pleroma/plugs/static_fe_plug.ex
+++ b/lib/pleroma/plugs/static_fe_plug.ex
@@ -1,19 +1,26 @@
# Pleroma: A lightweight social networking server
-# Copyright © 2017-2019 Pleroma Authors
+# Copyright © 2017-2020 Pleroma Authors
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Plugs.StaticFEPlug do
- def init(options), do: options
+ import Plug.Conn
+ alias Pleroma.Web.StaticFE.StaticFEController
- def accepts_html?({"accept", a}), do: String.contains?(a, "text/html")
- def accepts_html?({_, _}), do: false
+ def init(options), do: options
def call(conn, _) do
- with true <- Pleroma.Config.get([:instance, :static_fe], false),
- {_, _} <- Enum.find(conn.req_headers, &accepts_html?/1) do
- Pleroma.Web.StaticFE.StaticFEController.call(conn, :show)
+ if enabled?() and requires_html?(conn) do
+ conn
+ |> StaticFEController.call(:show)
+ |> halt()
else
- _ -> conn
+ conn
end
end
+
+ defp enabled?, do: Pleroma.Config.get([:static_fe, :enabled], false)
+
+ defp requires_html?(conn) do
+ Phoenix.Controller.get_format(conn) == "html"
+ end
end