Merge branch 'simplepolicy-announce-leak' into 'develop'

[akkoma] / lib / pleroma / web.ex

diff --git a/lib/pleroma/web.ex b/lib/pleroma/web.ex
index 0a4c98e4778c4f59d1f4249b7e8590943b94bdc5..24751faba4a3928158cc7c288586e96470259392 100644 (file)
--- a/lib/pleroma/web.ex
+++ b/lib/pleroma/web.ex
@@ -28,8 +28,6 @@ defmodule Pleroma.Web do
   alias Pleroma.Web.Plugs.OAuthScopesPlug
   alias Pleroma.Web.Plugs.PlugHelper
 
-  @mix_env Mix.env()
-
   def controller do
     quote do
       use Phoenix.Controller, namespace: Pleroma.Web
@@ -37,9 +35,10 @@ defmodule Pleroma.Web do
       import Plug.Conn
 
       import Pleroma.Web.Gettext
-      import Pleroma.Web.Router.Helpers
       import Pleroma.Web.TranslationHelpers
 
+      alias Pleroma.Web.Router.Helpers, as: Routes
+
       plug(:set_put_layout)
 
       defp set_put_layout(conn, _) do
@@ -133,7 +132,8 @@ defmodule Pleroma.Web do
 
       import Pleroma.Web.ErrorHelpers
       import Pleroma.Web.Gettext
-      import Pleroma.Web.Router.Helpers
+
+      alias Pleroma.Web.Router.Helpers, as: Routes
 
       require Logger
 
@@ -236,13 +236,10 @@ defmodule Pleroma.Web 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 or
-          String.starts_with?(r.path, "/#{@mix_env}")
-    end)
+    |> Enum.reject(fn r -> r.plug == Pleroma.Web.Fallback.RedirectController end)
     |> Enum.map(fn r ->
       r.path
       |> String.split("/", trim: true)