diff options
author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-07-19 20:05:37 +0300 |
---|---|---|
committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-07-19 20:05:37 +0300 |
commit | bdf57b8ef438f32999ef917777b13161320644a8 (patch) | |
tree | b72dc8ce2621eeb25e14504d6ce73c6657fac571 /docs/API/pleroma_api.md | |
parent | 9faa63203717e71d666afb6755ff0b781b491823 (diff) | |
parent | f0d13fc3f7d0e9b58cfe1cd8918072d45d656a31 (diff) | |
download | pleroma-bdf57b8ef438f32999ef917777b13161320644a8.tar.gz pleroma-bdf57b8ef438f32999ef917777b13161320644a8.zip |
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
# Conflicts:
# config/config.exs
# lib/pleroma/web/media_proxy/media_proxy.ex
# mix.lock
# test/web/media_proxy/media_proxy_test.exs
Diffstat (limited to 'docs/API/pleroma_api.md')
-rw-r--r-- | docs/API/pleroma_api.md | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/docs/API/pleroma_api.md b/docs/API/pleroma_api.md index b7eee5192..5bd38ad36 100644 --- a/docs/API/pleroma_api.md +++ b/docs/API/pleroma_api.md @@ -287,11 +287,8 @@ See [Admin-API](admin_api.md) * Method `PUT` * Authentication: required * Params: - * `followers`: BOOLEAN field, receives notifications from followers - * `follows`: BOOLEAN field, receives notifications from people the user follows - * `remote`: BOOLEAN field, receives notifications from people on remote instances - * `local`: BOOLEAN field, receives notifications from people on the local instance - * `privacy_option`: BOOLEAN field. When set to true, it removes the contents of a message from the push notification. + * `block_from_strangers`: BOOLEAN field, blocks notifications from accounts you do not follow + * `hide_notification_contents`: BOOLEAN field. When set to true, it removes the contents of a message from the push notification. * Response: JSON. Returns `{"status": "success"}` if the update was successful, otherwise returns `{"error": "error_msg"}` ## `/api/pleroma/healthcheck` |