X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Frel_me.ex;h=afb525dbe7c4ddeb7bc6e8fdf922431282bc6045;hb=a079ec3a3cdfd42d2cbd51c7698c2c87828e5778;hp=650c6a3fc1d251e36ff4cf42a93e19f9fcd7fc8b;hpb=713612c37725c81b0906b03528c9eaa474816c7d;p=akkoma
diff --git a/lib/pleroma/web/rel_me.ex b/lib/pleroma/web/rel_me.ex
index 650c6a3fc..afb525dbe 100644
--- a/lib/pleroma/web/rel_me.ex
+++ b/lib/pleroma/web/rel_me.ex
@@ -1,12 +1,11 @@
# 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
@@ -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