nrd.li/akkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source 
[#36] Add warnings when file upload fails

See merge request pleroma/pleroma!523
This commit is contained in:
href 2018-12-14 13:00:24 +00:00
parent 30dc81667c 15616eda5e
commit 91236c60c7
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/pleroma/web/twitter_api/controllers/util_controller.ex
View file

@ -159,11 +159,19 @@ def config(conn, _params) do
vapid_public_key = vapid_public_key =
Keyword.get(Application.get_env(:web_push_encryption, :vapid_details), :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 = %{ data = %{
name: Keyword.get(instance, :name), name: Keyword.get(instance, :name),
description: Keyword.get(instance, :description), description: Keyword.get(instance, :description),
server: Web.base_url(), server: Web.base_url(),
textlimit: to_string(Keyword.get(instance, :limit)), textlimit: to_string(Keyword.get(instance, :limit)),
uploadlimit: uploadlimit,
closed: if(Keyword.get(instance, :registrations_open), do: "0", else: "1"), closed: if(Keyword.get(instance, :registrations_open), do: "0", else: "1"),
private: if(Keyword.get(instance, :public, true), do: "0", else: "1"), private: if(Keyword.get(instance, :public, true), do: "0", else: "1"),
vapidPublicKey: vapid_public_key vapidPublicKey: vapid_public_key