forked from mirrors/akkoma
Merge branch 'cycles-frontend-static' into 'develop'
Recompilation speedup: make Router a runtime dep of FrontendStatic See merge request pleroma/pleroma!3429
This commit is contained in:
commit
75b94a2f35
1 changed files with 5 additions and 4 deletions
|
@ -10,8 +10,6 @@ defmodule Pleroma.Web.Plugs.FrontendStatic do
|
|||
"""
|
||||
@behaviour Plug
|
||||
|
||||
@api_routes Pleroma.Web.Router.get_api_routes()
|
||||
|
||||
def file_path(path, frontend_type \\ :primary) do
|
||||
if configuration = Pleroma.Config.get([:frontends, frontend_type]) do
|
||||
instance_static_path = Pleroma.Config.get([:instance, :static_dir], "instance/static")
|
||||
|
@ -55,10 +53,13 @@ defmodule Pleroma.Web.Plugs.FrontendStatic do
|
|||
defp invalid_path?([h | t], match), do: String.contains?(h, match) or invalid_path?(t)
|
||||
defp invalid_path?([], _match), do: false
|
||||
|
||||
defp api_route?([h | _]) when h in @api_routes, do: true
|
||||
defp api_route?([_ | t]), do: api_route?(t)
|
||||
defp api_route?([]), do: false
|
||||
|
||||
defp api_route?([h | t]) do
|
||||
api_routes = Pleroma.Web.Router.get_api_routes()
|
||||
if h in api_routes, do: true, else: api_route?(t)
|
||||
end
|
||||
|
||||
defp call_static(conn, opts, from) do
|
||||
opts = Map.put(opts, :from, from)
|
||||
Plug.Static.call(conn, opts)
|
||||
|
|
Loading…
Reference in a new issue