diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2020-09-18 22:13:05 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-09-18 22:13:05 +0300 |
| commit | ed3bc53fa137ec4652606cad1df5783c47afb830 (patch) | |
| tree | ab05f72720d2118b6f22b159c80bf5de4961d7ce /lib/pleroma/instances/instance.ex | |
| parent | 2159daa9af8967fe4b6d31e19c7048979b4cb165 (diff) | |
| parent | 6c052bd5b6cc29d321b500654bd6b098d0e6c56a (diff) | |
| download | pleroma-ed3bc53fa137ec4652606cad1df5783c47afb830.tar.gz | |
Merge branch 'develop' into issue/2099
Diffstat (limited to 'lib/pleroma/instances/instance.ex')
| -rw-r--r-- | lib/pleroma/instances/instance.ex | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/pleroma/instances/instance.ex b/lib/pleroma/instances/instance.ex index 6948651c7..f0f601469 100644 --- a/lib/pleroma/instances/instance.ex +++ b/lib/pleroma/instances/instance.ex @@ -156,9 +156,7 @@ defmodule Pleroma.Instances.Instance do defp scrape_favicon(%URI{} = instance_uri) do try do with {:ok, %Tesla.Env{body: html}} <- - Pleroma.HTTP.get(to_string(instance_uri), [{"accept", "text/html"}], - adapter: [pool: :media] - ), + Pleroma.HTTP.get(to_string(instance_uri), [{"accept", "text/html"}], pool: :media), {_, [favicon_rel | _]} when is_binary(favicon_rel) <- {:parse, html |> Floki.parse_document!() |> Floki.attribute("link[rel=icon]", "href")}, |