projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix tests
[akkoma]
/
lib
/
pleroma
/
web
/
fallback
/
redirect_controller.ex
diff --git
a/lib/pleroma/web/fallback/redirect_controller.ex
b/lib/pleroma/web/fallback/redirect_controller.ex
index 1ac1319f815d8441e6181b9c965a1e1a8fc16f87..2e57fa42652874cb3de5c1bf20c5959acda59816 100644
(file)
--- a/
lib/pleroma/web/fallback/redirect_controller.ex
+++ b/
lib/pleroma/web/fallback/redirect_controller.ex
@@
-1,5
+1,5
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.Fallback.RedirectController do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.Fallback.RedirectController do
@@
-20,7
+20,7
@@
defmodule Pleroma.Web.Fallback.RedirectController do
def redirector(conn, _params, code \\ 200) do
conn
|> put_resp_content_type("text/html")
def redirector(conn, _params, code \\ 200) do
conn
|> put_resp_content_type("text/html")
- |> send_file(code, index_file_path())
+ |> send_file(code, index_file_path(
conn
))
end
def redirector_with_meta(conn, %{"maybe_nickname_or_id" => maybe_nickname_or_id} = params) do
end
def redirector_with_meta(conn, %{"maybe_nickname_or_id" => maybe_nickname_or_id} = params) do
@@
-33,7
+33,7
@@
defmodule Pleroma.Web.Fallback.RedirectController do
end
def redirector_with_meta(conn, params) do
end
def redirector_with_meta(conn, params) do
- {:ok, index_content} = File.read(index_file_path())
+ {:ok, index_content} = File.read(index_file_path(
conn
))
tags = build_tags(conn, params)
preloads = preload_data(conn, params)
tags = build_tags(conn, params)
preloads = preload_data(conn, params)
@@
-53,13
+53,14
@@
defmodule Pleroma.Web.Fallback.RedirectController do
end
def redirector_with_preload(conn, params) do
end
def redirector_with_preload(conn, params) do
- {:ok, index_content} = File.read(index_file_path())
+ {:ok, index_content} = File.read(index_file_path(
conn
))
preloads = preload_data(conn, params)
preloads = preload_data(conn, params)
+ tags = Metadata.build_static_tags(params)
title = "<title>#{Pleroma.Config.get([:instance, :name])}</title>"
response =
index_content
title = "<title>#{Pleroma.Config.get([:instance, :name])}</title>"
response =
index_content
- |> String.replace("<!--server-generated-meta-->", preloads <> title)
+ |> String.replace("<!--server-generated-meta-->",
tags <>
preloads <> title)
conn
|> put_resp_content_type("text/html")
conn
|> put_resp_content_type("text/html")
@@
-76,8
+77,9
@@
defmodule Pleroma.Web.Fallback.RedirectController do
|> text("")
end
|> text("")
end
- defp index_file_path do
- Pleroma.Web.Plugs.InstanceStatic.file_path("index.html")
+ defp index_file_path(conn) do
+ frontend_type = Pleroma.Web.Plugs.FrontendStatic.preferred_or_fallback(conn, :primary)
+ Pleroma.Web.Plugs.InstanceStatic.file_path("index.html", frontend_type)
end
defp build_tags(conn, params) do
end
defp build_tags(conn, params) do