mirror of
https://akkoma.dev/AkkomaGang/akkoma.git
synced 2024-11-23 15:05:45 +00:00
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
This commit is contained in:
commit
480932c8e5
|
@ -8,7 +8,7 @@ server {
|
||||||
}
|
}
|
||||||
|
|
||||||
server {
|
server {
|
||||||
listen 443;
|
listen 443 ssl http2;
|
||||||
ssl on;
|
ssl on;
|
||||||
ssl_session_timeout 5m;
|
ssl_session_timeout 5m;
|
||||||
|
|
||||||
|
@ -21,6 +21,12 @@ server {
|
||||||
|
|
||||||
server_name example.tld;
|
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 / {
|
location / {
|
||||||
add_header 'Access-Control-Allow-Origin' '*';
|
add_header 'Access-Control-Allow-Origin' '*';
|
||||||
proxy_http_version 1.1;
|
proxy_http_version 1.1;
|
||||||
|
|
|
@ -564,7 +564,8 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
|
||||||
},
|
},
|
||||||
push_subscription: nil,
|
push_subscription: nil,
|
||||||
accounts: accounts,
|
accounts: accounts,
|
||||||
custom_emojis: mastodon_emoji
|
custom_emojis: mastodon_emoji,
|
||||||
|
char_limit: Keyword.get(@instance, :limit)
|
||||||
} |> Jason.encode!
|
} |> Jason.encode!
|
||||||
conn
|
conn
|
||||||
|> put_layout(false)
|
|> put_layout(false)
|
||||||
|
|
Loading…
Reference in a new issue