denys/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "Longer timeouts for user fetching."

Browse source 
Breaks too many tests.

This reverts commit 7de3a65214.
This commit is contained in:
Roger Braun 2017-11-07 09:41:35 +01:00
parent 7de3a65214
commit 6dfa62800a
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/pleroma/web/web_finger/web_finger.ex
View file

@ -86,7 +86,7 @@ def get_template_from_xml(body) do
end
def find_lrdd_template(domain) do
with {:ok, %{status_code: status_code, body: body}} when status_code in 200..299 <- @httpoison.get("http://#{domain}/.well-known/host-meta", [], follow_redirect: true, timeout: 10_000, recv_timeout: 20_000) do
with {:ok, %{status_code: status_code, body: body}} when status_code in 200..299 <- @httpoison.get("http://#{domain}/.well-known/host-meta", [], follow_redirect: true) do
get_template_from_xml(body)
else
e ->
@ -107,7 +107,7 @@ def finger(account) do
with {:ok, template} <- find_lrdd_template(domain),
address <- String.replace(template, "{uri}", URI.encode(account)),
response <- @httpoison.get(address, ["Accept": "application/xrd+xml"], timeout: 10_000, recv_timeout: 20_000),
response <- @httpoison.get(address, ["Accept": "application/xrd+xml"]),
{:ok, %{status_code: status_code, body: body}} when status_code in 200..299 <- response,
doc when doc != :error<- XML.parse_document(body),
{:ok, data} <- webfinger_from_xml(doc) do

6
lib/pleroma/web/websub/websub.ex
View file

@ -142,11 +142,7 @@ def subscribe(subscriber, subscribed, requester \\ &request_subscription/1) do
requester.(subscription)
end
def long_get(url) do
@httpoison.get(url, [], timeout: 10_000, recv_timeout: 20_000)
end
def gather_feed_data(topic, getter \\ &long_get/1) do
def gather_feed_data(topic, getter \\ &@httpoison.get/1) do
with {:ok, response} <- getter.(topic),
status_code when status_code in 200..299 <- response.status_code,
body <- response.body,