X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Frel_me.ex;h=8e2b515086beb211b8781823c03bf6334f72c805;hb=dbcfac11b45b367185a3b18a2db3e3fb07e8f20d;hp=3f0ee9ac64ed31cd1d2a93fcdcedca33d9fae78b;hpb=9b83236fb0292ae19a981b8f464183f8c6214a48;p=akkoma

diff --git a/lib/pleroma/web/rel_me.ex b/lib/pleroma/web/rel_me.ex
index 3f0ee9ac6..8e2b51508 100644
--- a/lib/pleroma/web/rel_me.ex
+++ b/lib/pleroma/web/rel_me.ex
@@ -1,16 +1,14 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.RelMe do
-  @hackney_options [
+  @options [
     pool: :media,
-    timeout: 2_000,
-    recv_timeout: 2_000,
     max_body: 2_000_000
   ]
 
-  if Mix.env() == :test do
+  if Pleroma.Config.get(:env) == :test do
     def parse(url) when is_binary(url), do: parse_url(url)
   else
     def parse(url) when is_binary(url) do
@@ -25,12 +23,24 @@ defmodule Pleroma.Web.RelMe do
   def parse(_), do: {:error, "No URL provided"}
 
   defp parse_url(url) 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")
-
-    {:ok, data}
+    opts =
+      if Application.get_env(:tesla, :adapter) == Tesla.Adapter.Hackney do
+        Keyword.merge(@options,
+          recv_timeout: 2_000,
+          with_body: true
+        )
+      else
+        @options
+      end
+
+    with {:ok, %Tesla.Env{body: html, status: status}} when status in 200..299 <-
+           Pleroma.HTTP.get(url, [], adapter: opts),
+         {:ok, html_tree} <- Floki.parse_document(html),
+         data <-
+           Floki.attribute(html_tree, "link[rel~=me]", "href") ++
+             Floki.attribute(html_tree, "a[rel~=me]", "href") do
+      {:ok, data}
+    end
   rescue
     e -> {:error, "Parsing error: #{inspect(e)}"}
   end
@@ -40,12 +50,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