From: Hakaba Hitoyo <hakabahitoyo@example.com>
Date: Tue, 17 Jul 2018 07:45:18 +0000 (+0900)
Subject: do nothing if configuration is skipped
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=d76f0d87bebd655bcbc4259a47a4ee8fd4f00887;p=akkoma

do nothing if configuration is skipped
---

diff --git a/config/config.exs b/config/config.exs
index 3583e7b46..4d5a7564a 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -95,9 +95,9 @@ config :pleroma, :gopher,
   ip: {0, 0, 0, 0},
   port: 9999
 
-config :pleroma, :suggestions,
-  third_party_engine:
-    "http://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-suggestions-api.cgi?{{host}}+{{user}}"
+# config :pleroma, :suggestions,
+#   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 2f8139fe6..ac8f794e9 100644
--- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
+++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@@ -1076,28 +1076,33 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
   @suggestions Application.get_env(:pleroma, :suggestions)
 
   def suggestions(%{assigns: %{user: user}} = conn, _) do
-    host =
-      Application.get_env(:pleroma, Pleroma.Web.Endpoint)
-      |> Keyword.get(:url)
-      |> Keyword.get(:host)
-
-    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: 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)
+    api = Keyword.get(@suggestions, :third_party_engine, false)
+
+    if api do
+      host =
+        Application.get_env(:pleroma, Pleroma.Web.Endpoint)
+        |> Keyword.get(:url)
+        |> Keyword.get(:host)
+
+      user = user.nickname
+      url = String.replace(api, "{{host}}", host) |> String.replace("{{user}}", user)
+
+      with {:ok, %{status_code: 200, body: body}} <-
+             @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)
 
-      conn
-      |> json(data2)
+        conn
+        |> json(data2)
+      else
+        e -> Logger.error("Could not decode user at fetch #{url}, #{inspect(e)}")
+      end
     else
-      e -> Logger.error("Could not decode user at fetch #{url}, #{inspect(e)}")
+      json(conn, [])
     end
   end
 end