Merge branch 'feature/file-size-checking' into 'develop'

[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 0ed519ea64a5921da14a4cdb8ef41790f24f23eb..387f5bd716335e76a0097074cc219ad8044817ae 100644 (file)
--- a/lib/pleroma/web/twitter_api/controllers/util_controller.ex
+++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
@@ -159,11 +159,19 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
         vapid_public_key =
           Keyword.get(Application.get_env(:web_push_encryption, :vapid_details), :public_key)
 
+        uploadlimit = %{
+          uploadlimit: to_string(Keyword.get(instance, :upload_limit)),
+          avatarlimit: to_string(Keyword.get(instance, :avatar_upload_limit)),
+          backgroundlimit: to_string(Keyword.get(instance, :background_upload_limit)),
+          bannerlimit: to_string(Keyword.get(instance, :banner_upload_limit))
+        }
+
         data = %{
           name: Keyword.get(instance, :name),
           description: Keyword.get(instance, :description),
           server: Web.base_url(),
           textlimit: to_string(Keyword.get(instance, :limit)),
+          uploadlimit: uploadlimit,
           closed: if(Keyword.get(instance, :registrations_open), do: "0", else: "1"),
           private: if(Keyword.get(instance, :public, true), do: "0", else: "1"),
           vapidPublicKey: vapid_public_key
@@ -183,7 +191,10 @@ defmodule Pleroma.Web.TwitterAPI.UtilController do
           formattingOptionsEnabled: Keyword.get(instance_fe, :formatting_options_enabled),
           collapseMessageWithSubject: Keyword.get(instance_fe, :collapse_message_with_subject),
           hidePostStats: Keyword.get(instance_fe, :hide_post_stats),
-          hideUserStats: Keyword.get(instance_fe, :hide_user_stats)
+          hideUserStats: Keyword.get(instance_fe, :hide_user_stats),
+          scopeCopy: Keyword.get(instance_fe, :scope_copy),
+          subjectLineBehavior: Keyword.get(instance_fe, :subject_line_behavior),
+          alwaysShowSubjectInput: Keyword.get(instance_fe, :always_show_subject_input)
         }
 
         managed_config = Keyword.get(instance, :managed_config)