aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/controllers
diff options
context:
space:
mode:
authorRoman Chvanikov <chvanikoff@pm.me>2020-07-10 23:05:07 +0300
committerRoman Chvanikov <chvanikoff@pm.me>2020-07-10 23:05:07 +0300
commitbb693768ff6f6afcb0b888b5a39100c6ff41f6bf (patch)
treec98faa365dfed7e4f408b5b527bed4636d99e472 /lib/pleroma/web/controllers
parent6f0ac38f1d59264086e40392a59a1d753bd9b356 (diff)
downloadpleroma-bb693768ff6f6afcb0b888b5a39100c6ff41f6bf.tar.gz
Partially fix tests
Diffstat (limited to 'lib/pleroma/web/controllers')
-rw-r--r--lib/pleroma/web/controllers/frontend/default_controller.ex5
-rw-r--r--lib/pleroma/web/controllers/frontend/pleroma_controller.ex4
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)