diff options
| author | rinpatch <rinpatch@sdf.org> | 2020-09-11 10:42:25 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-09-11 10:42:25 +0000 |
| commit | 53dc61ba90eff3c9dd6c9a4d4f6e0c2744b27569 (patch) | |
| tree | a8f7cdf002d77357ff4f4125248f5d2fd90453e6 /lib | |
| parent | 03d1730f30787c10e7e12894eef8e945b6e9d670 (diff) | |
| parent | dbc013f24c3885960714425f201e372335d22345 (diff) | |
| download | pleroma-53dc61ba90eff3c9dd6c9a4d4f6e0c2744b27569.tar.gz | |
Merge branch 'bugfix/favicon-none-found' into 'develop'
instance: Handle not getting a favicon
See merge request pleroma/pleroma!2988
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/instances/instance.ex | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/lib/pleroma/instances/instance.ex b/lib/pleroma/instances/instance.ex index 8bf53c090..6948651c7 100644 --- a/lib/pleroma/instances/instance.ex +++ b/lib/pleroma/instances/instance.ex @@ -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 |