squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

id field

Browse Source
This commit is contained in:
hakabahitoyo 2018-07-14 14:03:30 +09:00
parent f96244006e
commit 2eeaf01627
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
View File

@ -1081,10 +1081,13 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
api = Keyword.get(@suggestions, :third_party_engine, "") api = Keyword.get(@suggestions, :third_party_engine, "")
url = String.replace(api, "{{host}}", host) |> String.replace("{{user}}", user) url = String.replace(api, "{{host}}", host) |> String.replace("{{user}}", user)
with {:ok, %{status_code: 200, body: body}} <- with {:ok, %{status_code: 200, body: body}} <-
@httpoison.get(url), @httpoison.get(url, [], [timeout: 300000, recv_timeout: 300000]),
{:ok, data} <- Jason.decode(body) do {:ok, data} <- Jason.decode(body) do
data2 = Enum.slice(data, 0, 40) |> Enum.map(fn(x) ->
Map.put(x, "id", User.get_or_fetch(x["acct"]).id)
end)
conn conn
|> json(data) |> json(data2)
else else
e -> Logger.error("Could not decode user at fetch #{url}, #{inspect(e)}") e -> Logger.error("Could not decode user at fetch #{url}, #{inspect(e)}")
end end