X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Frel_me.ex;h=afb525dbe7c4ddeb7bc6e8fdf922431282bc6045;hb=b2112302ce49a4bdf0d0a0779854cd9f1a838ff3;hp=e97c398dc6eafaf9c9d6526d24633bfc7cbdba8a;hpb=841e4e4d835b8d1cecb33102356ca045571ef1fc;p=akkoma

diff --git a/lib/pleroma/web/rel_me.ex b/lib/pleroma/web/rel_me.ex
index e97c398dc..afb525dbe 100644
--- a/lib/pleroma/web/rel_me.ex
+++ b/lib/pleroma/web/rel_me.ex
@@ -1,20 +1,19 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.RelMe do
-  @hackney_options [
-    pool: :media,
-    recv_timeout: 2_000,
+  @options [
     max_body: 2_000_000,
-    with_body: true
+    receive_timeout: 2_000
   ]
 
   if Pleroma.Config.get(:env) == :test do
     def parse(url) when is_binary(url), do: parse_url(url)
   else
+    @cachex Pleroma.Config.get([:cachex, :provider], Cachex)
     def parse(url) when is_binary(url) do
-      Cachex.fetch!(:rel_me_cache, url, fn _ ->
+      @cachex.fetch!(:rel_me_cache, url, fn _ ->
         {:commit, parse_url(url)}
       end)
     rescue
@@ -26,7 +25,7 @@ defmodule Pleroma.Web.RelMe do
 
   defp parse_url(url) do
     with {:ok, %Tesla.Env{body: html, status: status}} when status in 200..299 <-
-           Pleroma.HTTP.get(url, [], adapter: @hackney_options),
+           Pleroma.HTTP.get(url, [], @options),
          {:ok, html_tree} <- Floki.parse_document(html),
          data <-
            Floki.attribute(html_tree, "link[rel~=me]", "href") ++
@@ -38,16 +37,18 @@ defmodule Pleroma.Web.RelMe do
   end
 
   def maybe_put_rel_me("http" <> _ = target_page, profile_urls) when is_list(profile_urls) do
-    {:ok, rel_me_hrefs} = parse(target_page)
-
-    true = Enum.any?(rel_me_hrefs, fn x -> x in profile_urls end)
-
-    "me"
+    with {:parse, {:ok, rel_me_hrefs}} <- {:parse, parse(target_page)},
+         {:link_match, true} <-
+           {:link_match, Enum.any?(rel_me_hrefs, fn x -> x in profile_urls end)} do
+      "me"
+    else
+      e -> {:error, {:could_not_verify, target_page, e}}
+    end
   rescue
-    _ -> nil
+    e -> {:error, {:could_not_fetch, target_page, e}}
   end
 
   def maybe_put_rel_me(_, _) do
-    nil
+    {:error, :invalid_url}
   end
 end