Merge branch 'bugfix/apc2s_upload_activity' into 'develop'

[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..156e6788e0980fbf658ccf9fcd72a975d65ab2c6 100644 (file)
--- a/lib/pleroma/plugs/static_fe_plug.ex
+++ b/lib/pleroma/plugs/static_fe_plug.ex
@@ -1,14 +1,29 @@
 # 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 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
+    case get_req_header(conn, "accept") do
+      [accept | _] -> String.contains?(accept, "text/html")
+      _ -> false
     end
   end
 end