Pleroma.Web.RelMe: fixups

This commit is contained in:
Haelwenn (lanodan) Monnier 2019-03-02 06:32:03 +01:00
parent 25e588496a
commit 9b83236fb0
No known key found for this signature in database
GPG Key ID: D5B7A8E43C997DEE
1 changed files with 16 additions and 11 deletions

View File

@ -10,12 +10,10 @@ defmodule Pleroma.Web.RelMe do
max_body: 2_000_000 max_body: 2_000_000
] ]
def parse(nil), do: {:error, "No URL provided"}
if Mix.env() == :test do if Mix.env() == :test do
def parse(url), do: parse_url(url) def parse(url) when is_binary(url), do: parse_url(url)
else else
def parse(url) do 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)} {:commit, parse_url(url)}
end) end)
@ -24,20 +22,27 @@ def parse(url) do
end end
end end
def parse(_), do: {:error, "No URL provided"}
defp parse_url(url) do defp parse_url(url) do
{:ok, %Tesla.Env{body: html}} = Pleroma.HTTP.get(url, [], adapter: @hackney_options) {: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 rescue
e -> {:error, "Parsing error: #{inspect(e)}"} e -> {:error, "Parsing error: #{inspect(e)}"}
end end
def maybe_put_rel_me("http" <> _ = target_page, urls) when not is_nil(urls) do def maybe_put_rel_me("http" <> _ = target_page, profile_urls) when is_list(profile_urls) do
if Enum.any?(parse(target_page), fn x -> x in urls end) do {:ok, rel_me_hrefs} = parse(target_page)
true = Enum.any?(rel_me_hrefs, fn x -> x in profile_urls end)
"rel=\"me\" " "rel=\"me\" "
else rescue
"" _ -> ""
end
end end
def maybe_put_rel_me(_, _) do def maybe_put_rel_me(_, _) do