X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Frel_me.ex;h=afb525dbe7c4ddeb7bc6e8fdf922431282bc6045;hb=8c86a06ed12d93b88894282be1b4c665ccf72bc2;hp=28f75b18d624d297559f68e88c24b1fceea57d35;hpb=b867f9d7aebc4e5b8832228a54f928b9f92dad0e;p=akkoma
diff --git a/lib/pleroma/web/rel_me.ex b/lib/pleroma/web/rel_me.ex
index 28f75b18d..afb525dbe 100644
--- a/lib/pleroma/web/rel_me.ex
+++ b/lib/pleroma/web/rel_me.ex
@@ -1,19 +1,19 @@
# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors
+# Copyright © 2017-2021 Pleroma Authors
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.RelMe do
@options [
- pool: :media,
max_body: 2_000_000,
- recv_timeout: 2_000
+ 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
@@ -37,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