summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config/config.exs1
-rw-r--r--lib/pleroma/web/endpoint.ex3
2 files changed, 3 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs
index 151c6b826..cf8d6c2b7 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -49,6 +49,7 @@ config :pleroma, :instance,
name: "Pleroma",
email: "example@example.com",
limit: 5000,
+ upload_limit: 16_000_000,
registrations_open: true,
federating: true
diff --git a/lib/pleroma/web/endpoint.ex b/lib/pleroma/web/endpoint.ex
index 0a2ac853e..dde4e3ffe 100644
--- a/lib/pleroma/web/endpoint.ex
+++ b/lib/pleroma/web/endpoint.ex
@@ -34,7 +34,8 @@ defmodule Pleroma.Web.Endpoint do
Plug.Parsers,
parsers: [:urlencoded, :multipart, :json],
pass: ["*/*"],
- json_decoder: Jason
+ json_decoder: Jason,
+ length: Application.get_env(:pleroma, :instance) |> Keyword.get(:upload_limit)
)
plug(Plug.MethodOverride)