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

instance: Handle not getting a favicon

Browse source
This commit is contained in:
Haelwenn (lanodan) Monnier 2020-09-11 11:22:50 +02:00
commit dbc013f24c
No known key found for this signature in database
GPG key ID: D5B7A8E43C997DEE
2 changed files with 50 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/pleroma/instances/instance.ex
View file

@ -159,13 +159,11 @@ defmodule Pleroma.Instances.Instance do
Pleroma.HTTP.get(to_string(instance_uri), [{"accept", "text/html"}],
adapter: [pool: :media]
),
favicon_rel <-
html
|> Floki.parse_document!()
|> Floki.attribute("link[rel=icon]", "href")
|> List.first(),
favicon <- URI.merge(instance_uri, favicon_rel) |> to_string(),
true <- is_binary(favicon) do
{_, [favicon_rel | _]} when is_binary(favicon_rel) <-
{:parse,
html |> Floki.parse_document!() |> Floki.attribute("link[rel=icon]", "href")},
{_, favicon} when is_binary(favicon) <-
{:merge, URI.merge(instance_uri, favicon_rel) |> to_string()} do
favicon
else
_ -> nil