hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

thanks emacs/arch

Browse source
This commit is contained in:
Henry Jameson 2024-03-26 12:48:52 +02:00
parent d65bdde809
commit 2561febffd
1 changed files with 0 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
lib/pleroma/web/fallback/redirect_controller.ex
View file

@ -32,22 +32,6 @@ defmodule Pleroma.Web.Fallback.RedirectController do
def redirector(conn, _params, code \\ 200) do def redirector(conn, _params, code \\ 200) do
{:ok, index_content} = File.read(index_file_path()) {:ok, index_content} = File.read(index_file_path())
<<<<<<< HEAD
title = "<title>#{Pleroma.Config.get([:instance, :name])}</title>"
favicon = "<link rel='icon' href='#{Pleroma.Config.get([:instance, :favicon])}'>"
manifest = "<link rel='manifest' href='/manifest.json'>"
response =
index_content
|> String.replace(
"<!--server-generated-meta-->",
title <> favicon <> manifest
)
conn
|> put_resp_content_type("text/html")
|> send_resp(200, response)
=======
response = response =
index_content index_content
|> add_generated_metadata() |> add_generated_metadata()
@ -55,7 +39,6 @@ defmodule Pleroma.Web.Fallback.RedirectController do
conn conn
|> put_resp_content_type("text/html") |> put_resp_content_type("text/html")
|> send_resp(code, response) |> send_resp(code, response)
>>>>>>> origin/develop
end end
def redirector_with_meta(conn, %{"maybe_nickname_or_id" => maybe_nickname_or_id} = params) do def redirector_with_meta(conn, %{"maybe_nickname_or_id" => maybe_nickname_or_id} = params) do
@ -71,23 +54,10 @@ defmodule Pleroma.Web.Fallback.RedirectController do
{:ok, index_content} = File.read(index_file_path()) {:ok, index_content} = File.read(index_file_path())
tags = build_tags(conn, params) tags = build_tags(conn, params)
preloads = preload_data(conn, params) preloads = preload_data(conn, params)
<<<<<<< HEAD
title = "<title>#{Pleroma.Config.get([:instance, :name])}</title>"
favicon = "<link rel='icon' href='#{Pleroma.Config.get([:instance, :favicon])}'>"
manifest = "<link rel='manifest' href='/manifest.json'>"
response =
index_content
|> String.replace(
"<!--server-generated-meta-->",
tags <> preloads <> title <> favicon <> manifest
)
=======
response = response =
index_content index_content
|> add_generated_metadata(tags <> preloads) |> add_generated_metadata(tags <> preloads)
>>>>>>> origin/develop
conn conn
|> put_resp_content_type("text/html") |> put_resp_content_type("text/html")
@ -101,20 +71,10 @@ defmodule Pleroma.Web.Fallback.RedirectController do
def redirector_with_preload(conn, params) do def redirector_with_preload(conn, params) do
{:ok, index_content} = File.read(index_file_path()) {:ok, index_content} = File.read(index_file_path())
preloads = preload_data(conn, params) preloads = preload_data(conn, params)
<<<<<<< HEAD
title = "<title>#{Pleroma.Config.get([:instance, :name])}</title>"
favicon = "<link rel='icon' href='#{Pleroma.Config.get([:instance, :favicon])}'>"
manifest = "<link rel='manifest' href='/manifest.json'>"
response =
index_content
|> String.replace("<!--server-generated-meta-->", preloads <> title <> favicon <> manifest)
=======
response = response =
index_content index_content
|> add_generated_metadata(preloads) |> add_generated_metadata(preloads)
>>>>>>> origin/develop
conn conn
|> put_resp_content_type("text/html") |> put_resp_content_type("text/html")