diff options
| author | lain <lain@soykaf.club> | 2019-11-04 15:18:32 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2019-11-04 15:18:32 +0000 |
| commit | f7f69356bd9f52d65a801a0cf90d574f2e5efde8 (patch) | |
| tree | adeee8467a9108f438d643da9ca052098903715c /lib | |
| parent | bec6d02f30bcbb127bdad85847b8d3a67d6440fd (diff) | |
| parent | 5271bbcf11d7182c25c8ca06460823e00920e80d (diff) | |
| download | pleroma-f7f69356bd9f52d65a801a0cf90d574f2e5efde8.tar.gz pleroma-f7f69356bd9f52d65a801a0cf90d574f2e5efde8.zip | |
Merge branch 'missing-tesla-mocks' into 'develop'
add missing tesla mocks
See merge request pleroma/pleroma!1879
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/rel_me.ex | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/pleroma/web/rel_me.ex b/lib/pleroma/web/rel_me.ex index d376e2069..16b1a53d2 100644 --- a/lib/pleroma/web/rel_me.ex +++ b/lib/pleroma/web/rel_me.ex @@ -25,13 +25,13 @@ 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} + with {:ok, %Tesla.Env{body: html, status: status}} when status in 200..299 <- + Pleroma.HTTP.get(url, [], adapter: @hackney_options), + data <- + Floki.attribute(html, "link[rel~=me]", "href") ++ + Floki.attribute(html, "a[rel~=me]", "href") do + {:ok, data} + end rescue e -> {:error, "Parsing error: #{inspect(e)}"} end |