projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'feature/1792-update-actor-type' 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 e97c398dc6eafaf9c9d6526d24633bfc7cbdba8a..8e2b515086beb211b8781823c03bf6334f72c805 100644
(file)
--- a/
lib/pleroma/web/rel_me.ex
+++ b/
lib/pleroma/web/rel_me.ex
@@
-3,11
+3,9
@@
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.RelMe do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.RelMe do
- @
hackney_
options [
+ @options [
pool: :media,
pool: :media,
- recv_timeout: 2_000,
- max_body: 2_000_000,
- with_body: true
+ max_body: 2_000_000
]
if Pleroma.Config.get(:env) == :test do
]
if Pleroma.Config.get(:env) == :test do
@@
-25,8
+23,18
@@
defmodule Pleroma.Web.RelMe do
def parse(_), do: {:error, "No URL provided"}
defp parse_url(url) do
def parse(_), do: {:error, "No URL provided"}
defp parse_url(url) do
+ opts =
+ if Application.get_env(:tesla, :adapter) == Tesla.Adapter.Hackney do
+ Keyword.merge(@options,
+ recv_timeout: 2_000,
+ with_body: true
+ )
+ else
+ @options
+ end
+
with {:ok, %Tesla.Env{body: html, status: status}} when status in 200..299 <-
with {:ok, %Tesla.Env{body: html, status: status}} when status in 200..299 <-
- Pleroma.HTTP.get(url, [], adapter:
@hackney_option
s),
+ Pleroma.HTTP.get(url, [], adapter:
opt
s),
{:ok, html_tree} <- Floki.parse_document(html),
data <-
Floki.attribute(html_tree, "link[rel~=me]", "href") ++
{:ok, html_tree} <- Floki.parse_document(html),
data <-
Floki.attribute(html_tree, "link[rel~=me]", "href") ++