diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-03-30 06:31:06 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-03-30 06:31:06 +0000 |
| commit | b9ee17a8531e029dda2fa112e0cf814305808ec9 (patch) | |
| tree | 8f61530cd3f900d5ce767e4a8f3f1c3c58e1ba70 /lib | |
| parent | f8f3abe1bec5ce33a4f4710a116795868b35f38d (diff) | |
| parent | 457e0404737e02a49c68c1875ff3171e4c43dde0 (diff) | |
| download | pleroma-b9ee17a8531e029dda2fa112e0cf814305808ec9.tar.gz | |
Merge branch 'char-limit-mastofe' into 'develop'
Add char_limit to initial-state of mastofe
See merge request pleroma/pleroma!86
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | 3 |
1 files changed, 2 insertions, 1 deletions
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) |