aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--installation/pleroma.nginx8
-rw-r--r--lib/pleroma/web/mastodon_api/mastodon_api_controller.ex3
2 files changed, 9 insertions, 2 deletions
diff --git a/installation/pleroma.nginx b/installation/pleroma.nginx
index fcc3997d3..25f6dadff 100644
--- a/installation/pleroma.nginx
+++ b/installation/pleroma.nginx
@@ -8,7 +8,7 @@ server {
}
server {
- listen 443;
+ listen 443 ssl http2;
ssl on;
ssl_session_timeout 5m;
@@ -21,6 +21,12 @@ server {
server_name example.tld;
+ gzip_vary on;
+ gzip_proxied any;
+ gzip_comp_level 6;
+ gzip_buffers 16 8k;
+ gzip_http_version 1.1;
+ gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript application/activity+json application/atom+xml;
location / {
add_header 'Access-Control-Allow-Origin' '*';
proxy_http_version 1.1;
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
index 70a7fa863..9428acd7e 100644
--- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
+++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@@ -564,7 +564,8 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
},
push_subscription: nil,
accounts: accounts,
- custom_emojis: mastodon_emoji
+ custom_emojis: mastodon_emoji,
+ char_limit: Keyword.get(@instance, :limit)
} |> Jason.encode!
conn
|> put_layout(false)