diff options
| author | lambda <lain@soykaf.club> | 2019-03-26 16:01:52 +0000 |
|---|---|---|
| committer | lambda <lain@soykaf.club> | 2019-03-26 16:01:52 +0000 |
| commit | c6ab5ebe7cd31ef7aa040d280d5efa63f9bcdc50 (patch) | |
| tree | 4c95faef03eb4838c17413a9a4b002d60e26ddb8 /lib/pleroma/web/mastodon_api | |
| parent | 9e3899bf36cea47560c5de1d4787125f6296a3b8 (diff) | |
| parent | 47b49ab1a1453ac2068cca336ad6db9877c3e64b (diff) | |
| download | pleroma-c6ab5ebe7cd31ef7aa040d280d5efa63f9bcdc50.tar.gz | |
Merge branch 'features/mastoapi/2.7.2-instance-attributes' into 'develop'
Mastodon 2.7.2 instance attributes (registrations, languages)
See merge request pleroma/pleroma!979
Diffstat (limited to 'lib/pleroma/web/mastodon_api')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex index 6be0f2baf..6b7c67012 100644 --- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex +++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex @@ -161,6 +161,9 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do }, stats: Stats.get_stats(), thumbnail: Web.base_url() <> "/instance/thumbnail.jpeg", + languages: ["en"], + registrations: Pleroma.Config.get([:instance, :registrations_open]), + # Extra (not present in Mastodon): max_toot_chars: Keyword.get(instance, :limit) } |