projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
in dev, allow dev FE
[akkoma]
/
lib
/
pleroma
/
web
/
plugs
/
frontend_static.ex
diff --git
a/lib/pleroma/web/plugs/frontend_static.ex
b/lib/pleroma/web/plugs/frontend_static.ex
index 62283353ed63311791d965b898773e319e5c3b5e..1d68614568fb967b479ee4d41de3c0c5b6c1dd06 100644
(file)
--- a/
lib/pleroma/web/plugs/frontend_static.ex
+++ b/
lib/pleroma/web/plugs/frontend_static.ex
@@
-71,16
+71,19
@@
defmodule Pleroma.Web.Plugs.FrontendStatic do
Map.get(cookies, @frontend_cookie_name)
end
Map.get(cookies, @frontend_cookie_name)
end
- def preferred_or_fallback(conn, fallback) do
+ # Only override primary frontend
+ def preferred_or_fallback(conn, :primary) do
case preferred_frontend(conn) do
nil ->
case preferred_frontend(conn) do
nil ->
- fallback
+ :primary
frontend ->
frontend
end
end
frontend ->
frontend
end
end
+ def preferred_or_fallback(_conn, fallback), do: fallback
+
defp enabled?(if_opt) when is_function(if_opt), do: if_opt.()
defp enabled?(true), do: true
defp enabled?(_), do: false
defp enabled?(if_opt) when is_function(if_opt), do: if_opt.()
defp enabled?(true), do: true
defp enabled?(_), do: false
@@
-102,7
+105,6
@@
defmodule Pleroma.Web.Plugs.FrontendStatic do
defp call_static(conn, opts, from) do
opts = Map.put(opts, :from, from)
defp call_static(conn, opts, from) do
opts = Map.put(opts, :from, from)
- IO.inspect(opts, label: "opts")
Plug.Static.call(conn, opts)
end
end
Plug.Static.call(conn, opts)
end
end