diff options
| author | lain <lain@soykaf.club> | 2021-01-05 13:33:57 +0100 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2021-01-05 13:33:57 +0100 |
| commit | fee0c6a2cb058282ee6c3960730201f58b691270 (patch) | |
| tree | 9a5e0057d20651fbde1fe8180cabf7744a3a26ca /docs/API | |
| parent | 7b44605cb89943a905f6a0a7aab9ebeea58aa7ab (diff) | |
| parent | 7a03b112f2ae0acbb546975a3cb57f63ab69708d (diff) | |
| download | pleroma-fee0c6a2cb058282ee6c3960730201f58b691270.tar.gz | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-confirm-users
Diffstat (limited to 'docs/API')
| -rw-r--r-- | docs/API/admin_api.md | 1 | ||||
| -rw-r--r-- | docs/API/differences_in_mastoapi_responses.md | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/docs/API/admin_api.md b/docs/API/admin_api.md index 266f8cef8..5253dc668 100644 --- a/docs/API/admin_api.md +++ b/docs/API/admin_api.md @@ -1123,6 +1123,7 @@ Loads json generated from `config/descriptions.exs`. ```json [ { + "id": 1234, "data": { "actor": { "id": 1, diff --git a/docs/API/differences_in_mastoapi_responses.md b/docs/API/differences_in_mastoapi_responses.md index 1b197e073..84430408b 100644 --- a/docs/API/differences_in_mastoapi_responses.md +++ b/docs/API/differences_in_mastoapi_responses.md @@ -206,6 +206,7 @@ Additional parameters can be added to the JSON body/Form data: - `pleroma_settings_store` - Opaque user settings to be saved on the backend. - `skip_thread_containment` - if true, skip filtering out broken threads - `allow_following_move` - if true, allows automatically follow moved following accounts +- `also_known_as` - array of ActivityPub IDs, needed for following move - `pleroma_background_image` - sets the background image of the user. Can be set to "" (an empty string) to reset. - `discoverable` - if true, external services (search bots) etc. are allowed to index / list the account (regardless of this setting, user will still appear in regular search results). - `actor_type` - the type of this account. |