Merge remote-tracking branch 'origin/debug-suggestions-api' into correct-and-improve-http-options
This commit is contained in:
commit
505d820827
@ -1182,7 +1182,15 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
|
||||
url = String.replace(api, "{{host}}", host) |> String.replace("{{user}}", user)
|
||||
|
||||
with {:ok, %{status: 200, body: body}} <-
|
||||
@httpoison.get(url, [], timeout: timeout, recv_timeout: timeout),
|
||||
@httpoison.get(
|
||||
url,
|
||||
[],
|
||||
follow_redirect: true,
|
||||
adapter: [
|
||||
timeout: timeout,
|
||||
recv_timeout: timeout
|
||||
]
|
||||
),
|
||||
{:ok, data} <- Jason.decode(body) do
|
||||
data2 =
|
||||
Enum.slice(data, 0, limit)
|
||||
|
Loading…
Reference in New Issue
Block a user