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 b3fb3c582037c1cc7d393edf299dc44a964c1bf3..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
# 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
@@
-9,7
+9,7
@@
defmodule Pleroma.Plugs.StaticFEPlug do
def init(options), do: options
def call(conn, _) do
def init(options), do: options
def call(conn, _) do
- if enabled?() and
accept
s_html?(conn) do
+ if enabled?() and
require
s_html?(conn) do
conn
|> StaticFEController.call(:show)
|> halt()
conn
|> StaticFEController.call(:show)
|> halt()
@@
-20,7
+20,7
@@
defmodule Pleroma.Plugs.StaticFEPlug do
defp enabled?, do: Pleroma.Config.get([:static_fe, :enabled], false)
defp enabled?, do: Pleroma.Config.get([:static_fe, :enabled], false)
- defp
accept
s_html?(conn) do
- conn |> get_req_header("accept") |> List.first() |> String.contains?("text/html")
+ defp
require
s_html?(conn) do
+ Phoenix.Controller.get_format(conn) == "html"
end
end
end
end