remove pool and timeout options which duplicate with the default

This commit is contained in:
Hakaba Hitoyo 2018-12-06 11:23:15 +09:00
commit 27792b2d77
5 changed files with 9 additions and 22 deletions

View file

@ -766,9 +766,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
@httpoison.get(
id,
[Accept: "application/activity+json"],
follow_redirect: true,
timeout: 10000,
recv_timeout: 20000
follow_redirect: true
),
{:ok, data} <- Jason.decode(body),
:ok <- Transmogrifier.contain_origin_from_id(id, data) do