commit: 91236c60c7aa266c1e874ebdd2aa44becfc6709b
parent: 30dc81667c56216e712564975ed60c062676490b
Author: href <href+git-pleroma@random.sh>
Date: Fri, 14 Dec 2018 13:00:24 +0000
Merge branch 'feature/file-size-checking' into 'develop'
[#36] Add warnings when file upload fails
See merge request pleroma/pleroma!523
Diffstat:
1 file changed, 8 insertions(+), 0 deletions(-)
diff --git 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