Revert "Longer timeouts for user fetching."

Breaks too many tests.

This reverts commit 7de3a652147d9b7da9cf3fd82d8a8438df93bae8.

diff --git a/lib/pleroma/web/web_finger/web_finger.ex b/lib/pleroma/web/web_finger/web_finger.ex
index a54f3c54d5c8bd4422f99a5928d2c240175729eb..7cbafe11ff72201746dc866f6e54753ebbcd8f21 100644 (file)
--- a/lib/pleroma/web/web_finger/web_finger.ex
+++ b/lib/pleroma/web/web_finger/web_finger.ex
@@ -86,7 +86,7 @@ defmodule Pleroma.Web.WebFinger 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 @@ defmodule Pleroma.Web.WebFinger 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

diff --git a/lib/pleroma/web/websub/websub.ex b/lib/pleroma/web/websub/websub.ex
index 41bdffb5bcccc6806279753c413127268c35d6ce..db1577a9373a71044263266a0b9443254dad2d94 100644 (file)
--- a/lib/pleroma/web/websub/websub.ex
+++ b/lib/pleroma/web/websub/websub.ex
@@ -142,11 +142,7 @@ defmodule Pleroma.Web.Websub 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,