squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Prevent AccountView and instance.get_or_update_favicon fails

Browse Source
This commit is contained in:
Haelwenn (lanodan) Monnier 2020-09-04 07:52:22 +02:00
parent da4660d2bf
commit 0d91f65284
No known key found for this signature in database
GPG Key ID: D5B7A8E43C997DEE
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/pleroma/instances/instance.ex
View File

@ -145,6 +145,8 @@ defmodule Pleroma.Instances.Instance do
favicon favicon
end end
rescue
_ -> nil
end end
defp scrape_favicon(%URI{} = instance_uri) do defp scrape_favicon(%URI{} = instance_uri) do
@ -159,7 +161,8 @@ defmodule Pleroma.Instances.Instance do
|> Floki.attribute("link[rel=icon]", "href") |> Floki.attribute("link[rel=icon]", "href")
|> List.first(), |> List.first(),
favicon <- URI.merge(instance_uri, favicon_rel) |> to_string(), 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 favicon
else else
_ -> nil _ -> nil