X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Frel_me.ex;h=26eb614a6e3b559609b45867506b719cd6d98906;hb=e641651e2b0ba9e6c4d0a99ebf4f7c3b25f7ce67;hp=3f0ee9ac64ed31cd1d2a93fcdcedca33d9fae78b;hpb=9b83236fb0292ae19a981b8f464183f8c6214a48;p=akkoma diff --git a/lib/pleroma/web/rel_me.ex b/lib/pleroma/web/rel_me.ex index 3f0ee9ac6..26eb614a6 100644 --- a/lib/pleroma/web/rel_me.ex +++ b/lib/pleroma/web/rel_me.ex @@ -5,9 +5,9 @@ defmodule Pleroma.Web.RelMe do @hackney_options [ pool: :media, - timeout: 2_000, recv_timeout: 2_000, - max_body: 2_000_000 + max_body: 2_000_000, + with_body: true ] if Mix.env() == :test do @@ -28,7 +28,8 @@ defmodule Pleroma.Web.RelMe do {:ok, %Tesla.Env{body: html}} = Pleroma.HTTP.get(url, [], adapter: @hackney_options) data = - Floki.attribute(html, "link[rel=me]", "href") ++ Floki.attribute(html, "a[rel=me]", "href") + Floki.attribute(html, "link[rel~=me]", "href") ++ + Floki.attribute(html, "a[rel~=me]", "href") {:ok, data} rescue @@ -40,12 +41,12 @@ defmodule Pleroma.Web.RelMe do true = Enum.any?(rel_me_hrefs, fn x -> x in profile_urls end) - "rel=\"me\" " + "me" rescue - _ -> "" + _ -> nil end def maybe_put_rel_me(_, _) do - "" + nil end end