From 1cdffb098e8ed6dee73459c7c4f2be30b357c45e Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Wed, 6 Jul 2022 17:46:05 +0300 Subject: [PATCH] Revert "Temporarily return 404 for favicons" This reverts commit 8d3bdd9816118acc05776ab61cf0ef5a5b26d976. --- lib/plausible_web/plugs/favicon.ex | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/lib/plausible_web/plugs/favicon.ex b/lib/plausible_web/plugs/favicon.ex index ad228286a..ac9562bf8 100644 --- a/lib/plausible_web/plugs/favicon.ex +++ b/lib/plausible_web/plugs/favicon.ex @@ -14,25 +14,22 @@ defmodule PlausibleWeb.Favicon do [favicon_domains: domains] end - def call(conn, _opts) do + def call(conn, favicon_domains: favicon_domains) do case conn.path_info do - ["favicon", "sources", _source] -> - send_resp(conn, 404, "") + ["favicon", "sources", source] -> + clean_source = URI.decode_www_form(source) + domain = Map.get(favicon_domains, clean_source, clean_source) + res = HTTPoison.get!("https://icons.duckduckgo.com/ip3/#{domain}.ico") + + conn = + Enum.filter(res.headers, fn {key, _val} -> key != "Transfer-Encoding" end) + |> Enum.reduce(conn, fn {key, val}, conn -> + put_resp_header(conn, key, val) + end) + + send_resp(conn, 200, res.body) |> halt - # clean_source = URI.decode_www_form(source) - # domain = Map.get(favicon_domains, clean_source, clean_source) - # res = HTTPoison.get!("https://icons.duckduckgo.com/ip3/#{domain}.ico") - - # conn = - # Enum.filter(res.headers, fn {key, _val} -> key != "Transfer-Encoding" end) - # |> Enum.reduce(conn, fn {key, val}, conn -> - # put_resp_header(conn, key, val) - # end) - - # send_resp(conn, 200, res.body) - # |> halt - _ -> conn end