Merge branch 'char-limit-mastofe' into 'develop'

Add char_limit to initial-state of mastofe See merge request pleroma/pleroma!86
2018-03-30 06:31:06 +00:00 · 2018-03-30 06:31:06 +00:00 · b9ee17a853
parent f8f3abe1be 457e040473
commit b9ee17a853
1 changed files with 2 additions and 1 deletions
--- 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)