Merge branch 'develop' into issue/1276

2 files changed, 0 insertions, 45 deletions

diff --git a/config/config.exs b/config/config.exs
index 2c154eb45..f4e307e18 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -425,14 +425,6 @@ config :pleroma, Pleroma.Web.Metadata,
   ],
   unfurl_nsfw: false
 
-config :pleroma, :suggestions,
-  enabled: false,
-  third_party_engine:
-    "http://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-suggestions-api.cgi?{{host}}+{{user}}",
-  timeout: 300_000,
-  limit: 40,
-  web: "https://vinayaka.distsn.org"
-
 config :pleroma, :http_security,
   enabled: true,
   sts: false,
diff --git a/config/description.exs b/config/description.exs
index b9b696e42..5f3c58b08 100644
--- a/config/description.exs
+++ b/config/description.exs
@@ -2749,43 +2749,6 @@ config :pleroma, :config_description, [
     ]
   },
   %{
-    group: :pleroma,
-    key: :suggestions,
-    type: :group,
-    children: [
-      %{
-        key: :enabled,
-        type: :boolean,
-        description: "Enables suggestions"
-      },
-      %{
-        key: :third_party_engine,
-        type: :string,
-        description: "URL for third party engine",
-        suggestions: [
-          "http://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-suggestions-api.cgi?{{host}}+{{user}}"
-        ]
-      },
-      %{
-        key: :timeout,
-        type: :integer,
-        description: "Request timeout to third party engine",
-        suggestions: [300_000]
-      },
-      %{
-        key: :limit,
-        type: :integer,
-        description: "Limit for suggestions",
-        suggestions: [40]
-      },
-      %{
-        key: :web,
-        type: :string,
-        suggestions: ["https://vinayaka.distsn.org"]
-      }
-    ]
-  },
-  %{
     group: :prometheus,
     key: Pleroma.Web.Endpoint.MetricsExporter,
     type: :group,