From a5aa8ea79603e22541de04c26293dc87bd2f2ed8 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Sun, 29 Oct 2023 18:58:57 +0200
Subject: Add support for configuring a favicon and embed PWA manifest in
 server-generated-meta

---
 lib/pleroma/web/fallback/redirect_controller.ex | 26 ++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/fallback/redirect_controller.ex b/lib/pleroma/web/fallback/redirect_controller.ex
index 1a86f7a53..005a5da8b 100644
--- a/lib/pleroma/web/fallback/redirect_controller.ex
+++ b/lib/pleroma/web/fallback/redirect_controller.ex
@@ -18,9 +18,22 @@ defmodule Pleroma.Web.Fallback.RedirectController do
   end
 
   def redirector(conn, _params, code \\ 200) do
+    {:ok, index_content} = File.read(index_file_path())
+
+    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_file(code, index_file_path())
+    |> send_resp(code, response)
   end
 
   def redirector_with_meta(conn, %{"maybe_nickname_or_id" => maybe_nickname_or_id} = params) do
@@ -38,10 +51,15 @@ defmodule Pleroma.Web.Fallback.RedirectController do
     tags = build_tags(conn, params)
     preloads = preload_data(conn, params)
     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)
+      |> String.replace(
+        "<!--server-generated-meta-->",
+        tags <> preloads <> title <> favicon <> manifest
+      )
 
     conn
     |> put_resp_content_type("text/html")
@@ -56,10 +74,12 @@ defmodule Pleroma.Web.Fallback.RedirectController do
     {:ok, index_content} = File.read(index_file_path())
     preloads = preload_data(conn, params)
     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)
+      |> String.replace("<!--server-generated-meta-->", preloads <> title <> favicon <> manifest)
 
     conn
     |> put_resp_content_type("text/html")
-- 
cgit v1.2.3


From 5d3e145dc4090dc5709a649ee5d646b637da252e Mon Sep 17 00:00:00 2001
From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
Date: Tue, 14 Nov 2023 11:01:02 +0100
Subject: RedirectController: Unify server-generated-meta insertion code

---
 lib/pleroma/web/fallback/redirect_controller.ex | 33 +++++++++++--------------
 1 file changed, 14 insertions(+), 19 deletions(-)

(limited to 'lib')

diff --git a/lib/pleroma/web/fallback/redirect_controller.ex b/lib/pleroma/web/fallback/redirect_controller.ex
index 005a5da8b..4a0885fab 100644
--- a/lib/pleroma/web/fallback/redirect_controller.ex
+++ b/lib/pleroma/web/fallback/redirect_controller.ex
@@ -17,19 +17,24 @@ defmodule Pleroma.Web.Fallback.RedirectController do
     |> json(%{error: "Not implemented"})
   end
 
-  def redirector(conn, _params, code \\ 200) do
-    {:ok, index_content} = File.read(index_file_path())
-
+  def add_generated_metadata(page_content, extra \\ "") do
     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'>"
 
+    page_content
+    |> String.replace(
+      "<!--server-generated-meta-->",
+      title <> favicon <> manifest <> extra
+    )
+  end
+
+  def redirector(conn, _params, code \\ 200) do
+    {:ok, index_content} = File.read(index_file_path())
+
     response =
       index_content
-      |> String.replace(
-        "<!--server-generated-meta-->",
-        title <> favicon <> manifest
-      )
+      |> add_generated_metadata()
 
     conn
     |> put_resp_content_type("text/html")
@@ -47,19 +52,12 @@ defmodule Pleroma.Web.Fallback.RedirectController do
 
   def redirector_with_meta(conn, params) do
     {:ok, index_content} = File.read(index_file_path())
-
     tags = build_tags(conn, params)
     preloads = preload_data(conn, params)
-    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
-      )
+      |> add_generated_metadata(tags <> preloads)
 
     conn
     |> put_resp_content_type("text/html")
@@ -73,13 +71,10 @@ defmodule Pleroma.Web.Fallback.RedirectController do
   def redirector_with_preload(conn, params) do
     {:ok, index_content} = File.read(index_file_path())
     preloads = preload_data(conn, params)
-    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)
+      |> add_generated_metadata(preloads)
 
     conn
     |> put_resp_content_type("text/html")
-- 
cgit v1.2.3