From: Rin Toshaka <rinpatch@sdf.org>
Date: Sat, 8 Dec 2018 20:48:49 +0000 (+0100)
Subject: Make uploadlimit an object that stores upload limits for avatars, banners, background... 
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=15616eda5e98bb13b1382109fb1f84537c58fcb1;p=akkoma

Make uploadlimit an object that stores upload limits for avatars, banners, backgrounds, general content
---

diff --git a/lib/pleroma/web/twitter_api/controllers/util_controller.ex b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
index 36ecefa76..1459f3c90 100644
--- a/lib/pleroma/web/twitter_api/controllers/util_controller.ex
+++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex
@@ -160,12 +160,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: to_string(Keyword.get(instance, :upload_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