pleroma

commit: 480932c8e524e1a80c9c8ef1a1aa23379f633afe
parent: c1d529ee9491fc0040cd4327c783aabf76cb66a8
Author: lain <lain@soykaf.club>
Date:   Fri, 30 Mar 2018 14:48:08 +0200

Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop

Diffstat:
M
installation/pleroma.nginx
8
+++++++-
M
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
3
++-

2 files changed, 9 insertions(+), 2 deletions(-)
diff --git 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
@@ -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)