projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'get_announce_visibility-name' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
rel_me.ex
diff --git
a/lib/pleroma/web/rel_me.ex
b/lib/pleroma/web/rel_me.ex
index 3f0ee9ac64ed31cd1d2a93fcdcedca33d9fae78b..d376e2069fb370264c508bdf5a4bb302aaaf2467 100644
(file)
--- a/
lib/pleroma/web/rel_me.ex
+++ b/
lib/pleroma/web/rel_me.ex
@@
-5,12
+5,12
@@
defmodule Pleroma.Web.RelMe do
@hackney_options [
pool: :media,
defmodule Pleroma.Web.RelMe do
@hackney_options [
pool: :media,
- timeout: 2_000,
recv_timeout: 2_000,
recv_timeout: 2_000,
- max_body: 2_000_000
+ max_body: 2_000_000,
+ with_body: true
]
]
- if
Mix.env(
) == :test do
+ if
Pleroma.Config.get(:env
) == :test do
def parse(url) when is_binary(url), do: parse_url(url)
else
def parse(url) when is_binary(url) do
def parse(url) when is_binary(url), do: parse_url(url)
else
def parse(url) when is_binary(url) do
@@
-28,7
+28,8
@@
defmodule Pleroma.Web.RelMe do
{:ok, %Tesla.Env{body: html}} = Pleroma.HTTP.get(url, [], adapter: @hackney_options)
data =
{: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
{:ok, data}
rescue
@@
-40,12
+41,12
@@
defmodule Pleroma.Web.RelMe do
true = Enum.any?(rel_me_hrefs, fn x -> x in profile_urls end)
true = Enum.any?(rel_me_hrefs, fn x -> x in profile_urls end)
- "
rel=\"me\"
"
+ "
me
"
rescue
rescue
- _ ->
""
+ _ ->
nil
end
def maybe_put_rel_me(_, _) do
end
def maybe_put_rel_me(_, _) do
- ""
+ nil
end
end
end
end