summaryrefslogtreecommitdiff
path: root/docs/API/pleroma_api.md
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2020-09-22 13:37:02 -0500
committerAlex Gleason <alex@alexgleason.me>2020-09-22 13:37:02 -0500
commit3104367931bdd259752fb9e2b7a19ba42a72e614 (patch)
tree92d59fed02dded222d51e300269f8a742e4c9c05 /docs/API/pleroma_api.md
parentbf181ca96850f3e5baaf8f3dcd6e11b926fcdeeb (diff)
parent02f12ec6253093d8bedaf84d78d0f7e533745e1b (diff)
downloadpleroma-3104367931bdd259752fb9e2b7a19ba42a72e614.tar.gz
pleroma-3104367931bdd259752fb9e2b7a19ba42a72e614.zip
Merge remote-tracking branch 'upstream/develop' into email-fix-develop
Diffstat (limited to 'docs/API/pleroma_api.md')
-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`