From 4aee900ae83eb9f26a91ac9b7e78f953afe6846e Mon Sep 17 00:00:00 2001 From: FloatingGhost Date: Thu, 14 Jul 2022 10:48:27 +0100 Subject: [PATCH 1/2] fix compilation --- lib/pleroma/web/endpoint.ex | 2 +- lib/{akkoma => pleroma}/web/swagger.ex | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename lib/{akkoma => pleroma}/web/swagger.ex (76%) diff --git a/lib/pleroma/web/endpoint.ex b/lib/pleroma/web/endpoint.ex index 4a235fdd7..62a6459b1 100644 --- a/lib/pleroma/web/endpoint.ex +++ b/lib/pleroma/web/endpoint.ex @@ -72,7 +72,7 @@ defmodule Pleroma.Web.Endpoint do at: "/akkoma/swaggerui", frontend_type: :swagger, gzip: true, - if: &Akkoma.Web.Swagger.ui_enabled?/0, + if: &Pleroma.Web.Swagger.ui_enabled?/0, cache_control_for_etags: @static_cache_control, headers: %{ "cache-control" => @static_cache_control diff --git a/lib/akkoma/web/swagger.ex b/lib/pleroma/web/swagger.ex similarity index 76% rename from lib/akkoma/web/swagger.ex rename to lib/pleroma/web/swagger.ex index c09cba3a1..e75ce2180 100644 --- a/lib/akkoma/web/swagger.ex +++ b/lib/pleroma/web/swagger.ex @@ -1,4 +1,4 @@ -defmodule Akkoma.Web.Swagger do +defmodule Pleroma.Web.Swagger do alias Pleroma.Config def ui_enabled? do From d598c7a834cb3aa8d9d4ca4ce4c319d5829e6062 Mon Sep 17 00:00:00 2001 From: FloatingGhost Date: Thu, 14 Jul 2022 11:17:14 +0100 Subject: [PATCH 2/2] remove anonymous function from plug --- lib/pleroma/web/plugs/frontend_static.ex | 8 ++++++-- lib/pleroma/web/swagger.ex | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/pleroma/web/plugs/frontend_static.ex b/lib/pleroma/web/plugs/frontend_static.ex index 5d9ae2ff7..40f51e149 100644 --- a/lib/pleroma/web/plugs/frontend_static.ex +++ b/lib/pleroma/web/plugs/frontend_static.ex @@ -31,13 +31,13 @@ defmodule Pleroma.Web.Plugs.FrontendStatic do |> Keyword.put(:from, "__unconfigured_frontend_static_plug") |> Plug.Static.init() |> Map.put(:frontend_type, opts[:frontend_type]) - |> Map.put(:if, Keyword.get(opts, :if, fn -> true end)) + |> Map.put(:if, Keyword.get(opts, :if, true)) end def call(conn, opts) do with false <- api_route?(conn.path_info), false <- invalid_path?(conn.path_info), - true <- opts[:if].(), + true <- enabled?(opts[:if]), frontend_type <- Map.get(opts, :frontend_type, :primary), path when not is_nil(path) <- file_path("", frontend_type) do call_static(conn, opts, path) @@ -47,6 +47,10 @@ defmodule Pleroma.Web.Plugs.FrontendStatic do end end + defp enabled?(if_opt) when is_function(if_opt), do: if_opt.() + defp enabled?(true), do: true + defp enabled?(_), do: false + defp invalid_path?(list) do invalid_path?(list, :binary.compile_pattern(["/", "\\", ":", "\0"])) end diff --git a/lib/pleroma/web/swagger.ex b/lib/pleroma/web/swagger.ex index e75ce2180..0e32c468b 100644 --- a/lib/pleroma/web/swagger.ex +++ b/lib/pleroma/web/swagger.ex @@ -2,6 +2,6 @@ defmodule Pleroma.Web.Swagger do alias Pleroma.Config def ui_enabled? do - Config.get([:frontends, :swagger, "enabled"]) + Config.get([:frontends, :swagger, "enabled"], false) end end