{mastodon api, twitter api}: make the follow handshake timeout configurable

[akkoma] / lib / pleroma / web / twitter_api / controllers / util_controller.ex

diff --git a/lib/pleroma/web/twitter_api/controllers/util_controller.ex b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
index 5b24809f95fcb2b250729bf5087fcce28402a687..4aaf28869c7dc8333651e209c7fc3296d7dcc33c 100644 (file)
--- a/lib/pleroma/web/twitter_api/controllers/util_controller.ex
+++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
@@ -176,11 +176,12 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
           chatDisabled: !Keyword.get(@instance_chat, :enabled),
           showInstanceSpecificPanel: Keyword.get(@instance_fe, :show_instance_panel),
           scopeOptionsEnabled: Keyword.get(@instance_fe, :scope_options_enabled),
-          collapseMessageWithSubject:
-            Keyword.get(@instance_fe, :collapse_message_with_subject)
+          formattingOptionsEnabled: Keyword.get(@instance_fe, :formatting_options_enabled),
+          collapseMessageWithSubject: Keyword.get(@instance_fe, :collapse_message_with_subject)
         }
 
         managed_config = Keyword.get(@instance, :managed_config)
+
         data =
           if managed_config do
             data |> Map.put("pleromafe", pleroma_fe)