From 2eeaf01627efb2a13d73f4cde764d3cb1fef3e98 Mon Sep 17 00:00:00 2001
From: hakabahitoyo <hakabahitoyo@example.com>
Date: Sat, 14 Jul 2018 14:03:30 +0900
Subject: [PATCH] id field
---
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
index fd60db3d6..d87a6cb19 100644
--- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
+++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@@ -1081,10 +1081,13 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
api = Keyword.get(@suggestions, :third_party_engine, "")
url = String.replace(api, "{{host}}", host) |> String.replace("{{user}}", user)
with {:ok, %{status_code: 200, body: body}} <-
- @httpoison.get(url),
+ @httpoison.get(url, [], [timeout: 300000, recv_timeout: 300000]),
{: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
- |> json(data)
+ |> json(data2)
else
e -> Logger.error("Could not decode user at fetch #{url}, #{inspect(e)}")
end