From 578051809f38c3d5d65155e264203c3b978a10a8 Mon Sep 17 00:00:00 2001 From: Rin Toshaka Date: Fri, 7 Dec 2018 20:03:30 +0100 Subject: [PATCH 1/2] Add uploadlimit to Twitter API config --- lib/pleroma/web/twitter_api/controllers/util_controller.ex | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/pleroma/web/twitter_api/controllers/util_controller.ex b/lib/pleroma/web/twitter_api/controllers/util_controller.ex index 092779010..36ecefa76 100644 --- a/lib/pleroma/web/twitter_api/controllers/util_controller.ex +++ b/lib/pleroma/web/twitter_api/controllers/util_controller.ex @@ -165,6 +165,7 @@ def config(conn, _params) do description: Keyword.get(instance, :description), server: Web.base_url(), textlimit: to_string(Keyword.get(instance, :limit)), + uploadlimit: to_string(Keyword.get(instance, :upload_limit)), 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 From 15616eda5e98bb13b1382109fb1f84537c58fcb1 Mon Sep 17 00:00:00 2001 From: Rin Toshaka Date: Sat, 8 Dec 2018 21:48:49 +0100 Subject: [PATCH 2/2] Make uploadlimit an object that stores upload limits for avatars, banners, backgrounds, general content --- .../web/twitter_api/controllers/util_controller.ex | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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 @@ def config(conn, _params) 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