Merge branch 'feature/1710-consolidate-instance-info' into 'develop'
authorrinpatch <rinpatch@sdf.org>
Sat, 2 May 2020 16:44:55 +0000 (16:44 +0000)
committerrinpatch <rinpatch@sdf.org>
Sat, 2 May 2020 16:44:55 +0000 (16:44 +0000)
Feature/1710 consolidate instance info

Closes #1710

See merge request pleroma/pleroma!2430

1  2 
CHANGELOG.md
docs/API/differences_in_mastoapi_responses.md

diff --cc CHANGELOG.md
Simple merge
index 041563de5bdf038aaaec1838d13a5fdfff08ad79,d0a776ebf1af5ad46fe564456aa1214276a8a6c4..c099eb1a0395e6db410f5c3ff5b2143dca3e0b93
@@@ -202,5 -190,18 +202,19 @@@ Has theses additional parameters (whic
  - `bio`: optional
  - `captcha_solution`: optional, contains provider-specific captcha solution,
  - `captcha_token`: optional, contains provider-specific captcha token
 +- `captcha_answer_data`: optional, contains provider-specific captcha data
  - `token`: invite token required when the registrations aren't public.
+ ## Instance
+ `GET /api/v1/instance` has additional fields
+ - `max_toot_chars`: The maximum characters per post
+ - `poll_limits`: The limits of polls
+ - `upload_limit`: The maximum upload file size
+ - `avatar_upload_limit`: The same for avatars
+ - `background_upload_limit`: The same for backgrounds
+ - `banner_upload_limit`: The same for banners
+ - `pleroma.metadata.features`: A list of supported features
+ - `pleroma.metadata.federation`: The federation restrictions of this instance
+ - `vapid_public_key`: The public key needed for push messages