X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fplugs%2Fstatic_fe_plug.ex;h=143665c71b0756c2913d578fdaea3751bdbb49c9;hb=fb33321fa2b3638af1c1edc35de1e4d23ba18711;hp=d3abaf4ccc8a2fab23781c26c14a85afa214a9bb;hpb=dc3b87d153415bee6a169b4c787f79dbee74c622;p=akkoma

diff --git a/lib/pleroma/plugs/static_fe_plug.ex b/lib/pleroma/plugs/static_fe_plug.ex
index d3abaf4cc..143665c71 100644
--- a/lib/pleroma/plugs/static_fe_plug.ex
+++ b/lib/pleroma/plugs/static_fe_plug.ex
@@ -1,14 +1,26 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Plugs.StaticFEPlug do
+  import Plug.Conn
+  alias Pleroma.Web.StaticFE.StaticFEController
+
   def init(options), do: options
 
   def call(conn, _) do
-    case Pleroma.Config.get([:instance, :static_fe], false) do
-      true -> Pleroma.Web.StaticFE.StaticFEController.call(conn, :show)
-      _ -> conn
+    if enabled?() and requires_html?(conn) do
+      conn
+      |> StaticFEController.call(:show)
+      |> halt()
+    else
+      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