diff options
| author | hakabahitoyo <hakabahitoyo@example.com> | 2018-07-15 20:36:26 +0900 |
|---|---|---|
| committer | hakabahitoyo <hakabahitoyo@example.com> | 2018-07-15 20:36:26 +0900 |
| commit | e7c580828c109247de11624bae8c7286b02441e5 (patch) | |
| tree | 1e506b9152f177d0e431274754f5d70eedaed49b | |
| parent | 2eeaf01627efb2a13d73f4cde764d3cb1fef3e98 (diff) | |
| download | pleroma-e7c580828c109247de11624bae8c7286b02441e5.tar.gz | |
format
| -rw-r--r-- | config/config.exs | 3 | ||||
| -rw-r--r-- | lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | 14 |
2 files changed, 11 insertions, 6 deletions
diff --git a/config/config.exs b/config/config.exs index 1f69e6244..3583e7b46 100644 --- a/config/config.exs +++ b/config/config.exs @@ -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. diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex index d87a6cb19..e397b911d 100644 --- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex +++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex @@ -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 |