Commit e7c58082 authored by hakabahitoyo's avatar hakabahitoyo

format

parent 2eeaf016
......@@ -96,7 +96,8 @@ config :pleroma, :gopher,
port: 9999
config :pleroma, :suggestions,
third_party_engine: "http://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-suggestions-api.cgi?{{host}}+{{user}}"
third_party_engine:
"http://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-suggestions-api.cgi?{{host}}+{{user}}"
# Import environment specific config. This must remain at the bottom
# of this file so it overrides the configuration defined above.
......
......@@ -1076,16 +1076,20 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
@suggestions Application.get_env(:pleroma, :suggestions)
def suggestions(%{assigns: %{user: user}} = conn, _) do
host = String.replace Web.base_url(), "https://", ""
host = String.replace(Web.base_url(), "https://", "")
user = user.nickname
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, [], [timeout: 300000, recv_timeout: 300000]),
@httpoison.get(url, [], timeout: 300_000, recv_timeout: 300_000),
{: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)
data2 =
Enum.slice(data, 0, 40)
|> Enum.map(fn x ->
Map.put(x, "id", User.get_or_fetch(x["acct"]).id)
end)
conn
|> json(data2)
else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment