Merge remote-tracking branch 'origin/develop' into global-status-expiration

[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 dcbabc9df00ff8ee07354afe39d52cca0359043e..deebe48791ceb8cc9185a3c5d9cba020a1f6c2d0 100644 (file)
--- 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 <https://pleroma.social/>
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
 # 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 accepts_html?(conn) do
+      conn
+      |> StaticFEController.call(:show)
+      |> halt()
     else
-      _ -> conn
+      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