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

Favicon Plug: Simplify and pass when not requesting favicon

Browse source
This commit is contained in:
Phantasm 2026-03-05 10:28:09 +01:00 • committed by Phantasm
commit d03ae43ee0
1 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lib/pleroma/web/plugs/favicon.ex
View file

@ -10,7 +10,6 @@ defmodule Pleroma.Web.Plugs.Favicon do
bypassing the frontend-specific logic.
"""
alias Pleroma.Web.Plugs.FrontendStatic
import Plug.Conn, only: [put_resp_header: 3]
def init(opts) do
@ -19,8 +18,8 @@ defmodule Pleroma.Web.Plugs.Favicon do
|> Plug.Static.init()
end
def call(conn, opts) do
case find_favicon_dir(conn) do
def call(%{request_path: "/favicon.png"} = conn, opts) do
case find_favicon_dir() do
{:ok, dir} ->
call_static(conn, opts, dir)
@ -29,20 +28,19 @@ defmodule Pleroma.Web.Plugs.Favicon do
end
end
defp find_favicon_dir(conn) do
def call(conn, _) do
conn
end
defp find_favicon_dir() do
instance_dir = Pleroma.Config.get([:instance, :static_dir], "instance/static")
instance_path = Path.join(instance_dir, "favicon.png")
frontend_type = FrontendStatic.preferred_or_fallback(conn, :primary)
frontend_dir = FrontendStatic.file_path("", frontend_type)
frontend_path = if frontend_dir, do: Path.join(frontend_dir, "favicon.png"), else: nil
priv_dir = Application.app_dir(:pleroma, "priv/static")
priv_path = Path.join(priv_dir, "favicon.png")
cond do
File.exists?(instance_path) -> {:ok, instance_dir}
frontend_path && File.exists?(frontend_path) -> {:ok, frontend_dir}
File.exists?(priv_path) -> {:ok, priv_dir}
true -> :error
end