diff options
| author | Haelwenn (lanodan) Monnier <contact@hacktivis.me> | 2020-09-04 07:52:22 +0200 |
|---|---|---|
| committer | Haelwenn (lanodan) Monnier <contact@hacktivis.me> | 2020-09-05 05:43:50 +0200 |
| commit | 0d91f65284f99bded89c0400e976e0ffa5bc202f (patch) | |
| tree | a3998054f0e662b2000ae800e39e65ddca1fd91c /lib | |
| parent | da4660d2bfd7cc8fe19649c4b51d86ee414b84e1 (diff) | |
| download | pleroma-0d91f65284f99bded89c0400e976e0ffa5bc202f.tar.gz | |
Prevent AccountView and instance.get_or_update_favicon fails
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/instances/instance.ex | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/pleroma/instances/instance.ex b/lib/pleroma/instances/instance.ex index 711c42158..ef5d17de4 100644 --- a/lib/pleroma/instances/instance.ex +++ b/lib/pleroma/instances/instance.ex @@ -145,6 +145,8 @@ defmodule Pleroma.Instances.Instance do favicon end + rescue + _ -> nil end defp scrape_favicon(%URI{} = instance_uri) do @@ -159,7 +161,8 @@ defmodule Pleroma.Instances.Instance do |> Floki.attribute("link[rel=icon]", "href") |> List.first(), favicon <- URI.merge(instance_uri, favicon_rel) |> to_string(), - true <- is_binary(favicon) do + true <- is_binary(favicon), + true <- String.length(favicon) <= 255 do favicon else _ -> nil |