Quellcode durchsuchen

Merge branch 'cycles-router-api-routes' into 'develop'

Recompilation speedup: Pleroma.Web.get_api_routes/0 --> Pleroma.Web.Router.get_api_routes/0

See merge request pleroma/pleroma!3419
docs-asdf
feld vor 3 Jahren
Ursprung
Commit
8871ca5aa3
4 geänderte Dateien mit 14 neuen und 14 gelöschten Zeilen
  1. +0
    -12
      lib/pleroma/web.ex
  2. +1
    -1
      lib/pleroma/web/plugs/frontend_static.ex
  3. +12
    -0
      lib/pleroma/web/router.ex
  4. +1
    -1
      test/pleroma/web/plugs/frontend_static_plug_test.exs

+ 0
- 12
lib/pleroma/web.ex Datei anzeigen

@@ -235,16 +235,4 @@ defmodule Pleroma.Web do
def base_url do
Pleroma.Web.Endpoint.url()
end

# TODO: Change to Phoenix.Router.routes/1 for Phoenix 1.6.0+
def get_api_routes do
Pleroma.Web.Router.__routes__()
|> Enum.reject(fn r -> r.plug == Pleroma.Web.Fallback.RedirectController end)
|> Enum.map(fn r ->
r.path
|> String.split("/", trim: true)
|> List.first()
end)
|> Enum.uniq()
end
end

+ 1
- 1
lib/pleroma/web/plugs/frontend_static.ex Datei anzeigen

@@ -10,7 +10,7 @@ defmodule Pleroma.Web.Plugs.FrontendStatic do
"""
@behaviour Plug

@api_routes Pleroma.Web.get_api_routes()
@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


+ 12
- 0
lib/pleroma/web/router.ex Datei anzeigen

@@ -826,4 +826,16 @@ defmodule Pleroma.Web.Router do

options("/*path", RedirectController, :empty)
end

# TODO: Change to Phoenix.Router.routes/1 for Phoenix 1.6.0+
def get_api_routes do
__MODULE__.__routes__()
|> Enum.reject(fn r -> r.plug == Pleroma.Web.Fallback.RedirectController end)
|> Enum.map(fn r ->
r.path
|> String.split("/", trim: true)
|> List.first()
end)
|> Enum.uniq()
end
end

+ 1
- 1
test/pleroma/web/plugs/frontend_static_plug_test.exs Datei anzeigen

@@ -103,6 +103,6 @@ defmodule Pleroma.Web.Plugs.FrontendStaticPlugTest do
"check_password"
]

assert expected_routes == Pleroma.Web.get_api_routes()
assert expected_routes == Pleroma.Web.Router.get_api_routes()
end
end

Laden…
Abbrechen
Speichern