summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2019-09-19 19:04:55 +0000
committerrinpatch <rinpatch@sdf.org>2019-09-19 19:04:55 +0000
commitc4da7499a3d7b0f5086c1180131df4e35b5b0d15 (patch)
tree17d6cad5218c69444401b8e38ad143cef303f1c6
parentc1e011624d33052d4d473ebfb4e0c1ff7d2327dd (diff)
parentfe4db3b94e71bafb913044de543472764671cd1a (diff)
downloadpleroma-c4da7499a3d7b0f5086c1180131df4e35b5b0d15.tar.gz
pleroma-c4da7499a3d7b0f5086c1180131df4e35b5b0d15.zip
Merge branch 'conversation-docs' into 'develop'
API Docs: Document conversation ids. See merge request pleroma/pleroma!1701
-rw-r--r--docs/api/differences_in_mastoapi_responses.md3
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/api/differences_in_mastoapi_responses.md b/docs/api/differences_in_mastoapi_responses.md
index 3c7f5dad7..d007a69c3 100644
--- a/docs/api/differences_in_mastoapi_responses.md
+++ b/docs/api/differences_in_mastoapi_responses.md
@@ -21,7 +21,8 @@ Adding the parameter `with_muted=true` to the timeline queries will also return
Has these additional fields under the `pleroma` object:
- `local`: true if the post was made on the local instance
-- `conversation_id`: the ID of the conversation the status is associated with (if any)
+- `conversation_id`: the ID of the AP context the status is associated with (if any)
+- `direct_conversation_id`: the ID of the Mastodon direct message conversation the status is associated with (if any)
- `in_reply_to_account_acct`: the `acct` property of User entity for replied user (if any)
- `content`: a map consisting of alternate representations of the `content` property with the key being it's mimetype. Currently the only alternate representation supported is `text/plain`
- `spoiler_text`: a map consisting of alternate representations of the `spoiler_text` property with the key being it's mimetype. Currently the only alternate representation supported is `text/plain`