Merge branch 'user-query/filter-out-internal' 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 2af45e52a61071c8a39aa2638916e27db1b1aa10..143665c71b0756c2913d578fdaea3751bdbb49c9 100644 (file)
--- a/lib/pleroma/plugs/static_fe_plug.ex
+++ b/lib/pleroma/plugs/static_fe_plug.ex
@@ -1,5 +1,5 @@
 # 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
@@ -9,7 +9,7 @@ defmodule Pleroma.Plugs.StaticFEPlug do
   def init(options), do: options
 
   def call(conn, _) do
-    if enabled?() and accepts_html?(conn) do
+    if enabled?() and requires_html?(conn) do
       conn
       |> StaticFEController.call(:show)
       |> halt()
@@ -18,9 +18,9 @@ defmodule Pleroma.Plugs.StaticFEPlug do
     end
   end
 
-  defp enabled?, do: Pleroma.Config.get([:instance, :static_fe], false)
+  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")
+  defp requires_html?(conn) do
+    Phoenix.Controller.get_format(conn) == "html"
   end
 end