Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instan...

[akkoma] / lib / pleroma / plugs / static_fe_plug.ex

diff --git a/lib/pleroma/plugs/static_fe_plug.ex b/lib/pleroma/plugs/static_fe_plug.ex
index d3abaf4ccc8a2fab23781c26c14a85afa214a9bb..7d69e661cdead718c1d9d9d96be670b96a9e374c 100644 (file)
--- a/lib/pleroma/plugs/static_fe_plug.ex
+++ b/lib/pleroma/plugs/static_fe_plug.ex
@@ -3,12 +3,27 @@
 # 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 accepts_html?(conn) do
+      conn
+      |> StaticFEController.call(:show)
+      |> halt()
+    else
+      conn
     end
   end
+
+  defp enabled?, do: Pleroma.Config.get([:static_fe, :enabled], false)
+
+  defp accepts_html?(conn) do
+    conn
+    |> get_req_header("accept")
+    |> List.first()
+    |> String.contains?("text/html")
+  end
 end