pleroma

commit: b564c23d925ca43c00364541b042f856063d479e
parent: 045953225e04862c914b51808907cc86b11fcaf4
Author: kaniini <nenolod@gmail.com>
Date:   Sun,  9 Sep 2018 11:38:33 +0000

Merge branch 'suggestion-api-restriction' into 'develop'

Make limit for /api/v1/suggestions

See merge request pleroma/pleroma!334
Diffstat:
M
config/config.exs
1
+
M
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
3
++-
M
lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
1
+

3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/config/config.exs b/config/config.exs
@@ -128,6 +128,7 @@ config :pleroma, :suggestions,
   third_party_engine:
     "http://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-suggestions-api.cgi?{{host}}+{{user}}",
   timeout: 300_000,
+  limit: 23,
   web: "https://vinayaka.distsn.org/?{{host}}+{{user}}"
 
 # Import environment specific config. This must remain at the bottom
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@@ -1148,6 +1148,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
     if Keyword.get(@suggestions, :enabled, false) do
       api = Keyword.get(@suggestions, :third_party_engine, "")
       timeout = Keyword.get(@suggestions, :timeout, 5000)
+      limit = Keyword.get(@suggestions, :limit, 23)
 
       host =
         Application.get_env(:pleroma, Pleroma.Web.Endpoint)
@@ -1161,7 +1162,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
              @httpoison.get(url, [], timeout: timeout, recv_timeout: timeout),
            {:ok, data} <- Jason.decode(body) do
         data2 =
-          Enum.slice(data, 0, 40)
+          Enum.slice(data, 0, limit)
           |> Enum.map(fn x ->
             Map.put(
               x,
diff --git a/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex b/lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
@@ -59,6 +59,7 @@ defmodule Pleroma.Web.Nodeinfo.NodeinfoController do
           enabled: Keyword.get(suggestions, :enabled, false),
           thirdPartyEngine: Keyword.get(suggestions, :third_party_engine, ""),
           timeout: Keyword.get(suggestions, :timeout, 5000),
+          limit: Keyword.get(suggestions, :limit, 23),
           web: Keyword.get(suggestions, :web, "")
         },
         staffAccounts: staff_accounts,