projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'release/2.1.0' into 'stable'
[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..143665c71b0756c2913d578fdaea3751bdbb49c9 100644
(file)
--- 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
# Pleroma: A lightweight social networking server
-# Copyright © 2017-20
19
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-20
20
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Plugs.StaticFEPlug do
# 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
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
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
end