Merge branch 'login-with-email' into 'develop'

[akkoma] / config / config.exs

diff --git a/config/config.exs b/config/config.exs
index ef5bcd65cdf3740b03808399edde4f4cffeb30e6..6b1e31398cdba486a2e70b6a37e320d06d3cf0ec 100644 (file)
--- a/config/config.exs
+++ b/config/config.exs
@@ -72,11 +72,8 @@ config :pleroma, :fe,
   redirect_root_no_login: "/main/all",
   redirect_root_login: "/main/friends",
   show_instance_panel: true,
-  show_who_to_follow_panel: false,
-  who_to_follow_provider:
-    "https://vinayaka.distsn.org/cgi-bin/vinayaka-user-match-osa-api.cgi?{{host}}+{{user}}",
-  who_to_follow_link: "https://vinayaka.distsn.org/?{{host}}+{{user}}",
-  scope_options_enabled: false
+  scope_options_enabled: false,
+  collapse_message_with_subject: false
 
 config :pleroma, :activitypub,
   accept_blocks: true,
@@ -113,6 +110,13 @@ config :pleroma, :gopher,
   ip: {0, 0, 0, 0},
   port: 9999
 
+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,
+  web: "https://vinayaka.distsn.org/?{{host}}+{{user}}"
+
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.
 import_config "#{Mix.env()}.exs"