format

diff --git a/config/config.exs b/config/config.exs
index 1f69e62440d6b3779f9e25b07444c5377798b4b2..3583e7b46498d27f6bca943a121e00ba52030b39 100644 (file)
--- 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 d87a6cb1909ee407033b3d5e90cc63200a1cace4..e397b911de1ec08728390d1ef9dc22ede81580d2 100644 (file)
--- 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