diff options
Diffstat (limited to 'lib/pleroma/web/controllers/frontend')
-rw-r--r-- | lib/pleroma/web/controllers/frontend/default_controller.ex | 5 | ||||
-rw-r--r-- | lib/pleroma/web/controllers/frontend/pleroma_controller.ex | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lib/pleroma/web/controllers/frontend/default_controller.ex b/lib/pleroma/web/controllers/frontend/default_controller.ex index e56288f06..fef748a19 100644 --- a/lib/pleroma/web/controllers/frontend/default_controller.ex +++ b/lib/pleroma/web/controllers/frontend/default_controller.ex @@ -5,11 +5,12 @@ defmodule Pleroma.Web.Frontend.DefaultController do defmacro __using__(_opts) do quote do - import Pleroma.Web.FrontendController, only: [index_file_path: 0, index_file_path: 1] + import Pleroma.Frontend, only: [fe_file_path: 1, fe_file_path: 2] def index(conn, _params) do status = conn.status || 200 - {:ok, index_file_path} = index_file_path(conn.private[:frontend][:config]) + + {:ok, index_file_path} = fe_file_path("index.html", conn.private[:frontend][:config]) conn |> put_resp_content_type("text/html") diff --git a/lib/pleroma/web/controllers/frontend/pleroma_controller.ex b/lib/pleroma/web/controllers/frontend/pleroma_controller.ex index b1286be54..2c48aeaba 100644 --- a/lib/pleroma/web/controllers/frontend/pleroma_controller.ex +++ b/lib/pleroma/web/controllers/frontend/pleroma_controller.ex @@ -24,7 +24,7 @@ defmodule Pleroma.Web.Frontend.PleromaController do # not intended to be matched from router, but can be called from the app internally def index_with_meta(conn, params) do - {:ok, path} = index_file_path() + {:ok, path} = fe_file_path("index.html") {:ok, index_content} = File.read(path) tags = @@ -48,7 +48,7 @@ defmodule Pleroma.Web.Frontend.PleromaController do end def index_with_preload(conn, params) do - {:ok, path} = index_file_path() + {:ok, path} = fe_file_path("index.html") {:ok, index_content} = File.read(path) preloads = preload_data(conn, params) |