aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorRoman Chvanikov <chvanikoff@pm.me>2020-09-23 13:56:50 +0300
committerRoman Chvanikov <chvanikoff@pm.me>2020-09-23 13:56:50 +0300
commit8f5589cf667d8dd24da07e58db94225d81a55a7b (patch)
tree7598cf8c495f0d02b3a4704a79e8618bd9652fee /docs
parentb0bd81ef7187ddf5b4e6cfbc1780fc60b65798c6 (diff)
parenta5e1c400e49e7979e70f2c9dd4887ae144dca44c (diff)
downloadpleroma-8f5589cf667d8dd24da07e58db94225d81a55a7b.tar.gz
Merge develop
Diffstat (limited to 'docs')
-rw-r--r--docs/API/pleroma_api.md16
1 files changed, 16 insertions, 0 deletions
diff --git a/docs/API/pleroma_api.md b/docs/API/pleroma_api.md
index 4e97d26c0..94b6a4fda 100644
--- a/docs/API/pleroma_api.md
+++ b/docs/API/pleroma_api.md
@@ -44,6 +44,22 @@ Request parameters can be passed via [query strings](https://en.wikipedia.org/wi
* Response: HTTP 200 on success, 500 on error
* Note: Users that can't be followed are silently skipped.
+## `/api/pleroma/blocks_import`
+### Imports your blocks.
+* Method: `POST`
+* Authentication: required
+* Params:
+ * `list`: STRING or FILE containing a whitespace-separated list of accounts to block
+* Response: HTTP 200 on success, 500 on error
+
+## `/api/pleroma/mutes_import`
+### Imports your mutes.
+* Method: `POST`
+* Authentication: required
+* Params:
+ * `list`: STRING or FILE containing a whitespace-separated list of accounts to mute
+* Response: HTTP 200 on success, 500 on error
+
## `/api/pleroma/captcha`
### Get a new captcha
* Method: `GET`