Merge branch 'bugfix/jsonb-set-fuckup' into 'release/1.1.1'

[akkoma] / docs / api / pleroma_api.md

diff --git a/docs/api/pleroma_api.md b/docs/api/pleroma_api.md
index 7d343e97ad3c1076981e484865732e1f1aa12705..30fac77dad7d20b1af3c70b7d83d1fe2cb6c82d4 100644 (file)
--- a/docs/api/pleroma_api.md
+++ b/docs/api/pleroma_api.md
@@ -252,7 +252,7 @@ See [Admin-API](Admin-API.md)
 * Params:
     * `email`: email of that needs to be verified
 * Authentication: not required
 * Params:
     * `email`: email of that needs to be verified
 * Authentication: not required

-* Response: 204 No Content 
+* Response: 204 No Content

 
 ## `/api/v1/pleroma/mascot`
 ### Gets user mascot image
 
 ## `/api/v1/pleroma/mascot`
 ### Gets user mascot image


@@ -321,11 +321,21 @@ See [Admin-API](Admin-API.md)
 }
 ```
 
 }
 ```
 

+## `/api/pleroma/change_email`
+### Change account email
+* Method `POST`
+* Authentication: required
+* Params:
+    * `password`: user's password
+    * `email`: new email
+* Response: JSON. Returns `{"status": "success"}` if the change was successful, `{"error": "[error message]"}` otherwise
+* Note: Currently, Mastodon has no API for changing email. If they add it in future it might be incompatible with Pleroma.
+

 # Pleroma Conversations
 
 Pleroma Conversations have the same general structure that Mastodon Conversations have. The behavior differs in the following ways when using these endpoints:
 
 # Pleroma Conversations
 
 Pleroma Conversations have the same general structure that Mastodon Conversations have. The behavior differs in the following ways when using these endpoints:
 

-1. Pleroma Conversations never add or remove recipients, unless explicitly changed by the user. 
+1. Pleroma Conversations never add or remove recipients, unless explicitly changed by the user.

 2. Pleroma Conversations statuses can be requested by Conversation id.
 3. Pleroma Conversations can be replied to.
 
 2. Pleroma Conversations statuses can be requested by Conversation id.
 3. Pleroma Conversations can be replied to.