summaryrefslogtreecommitdiff
path: root/docs/api/differences_in_mastoapi_responses.md
diff options
context:
space:
mode:
authorMaksim Pechnikov <parallel588@gmail.com>2019-09-23 21:32:50 +0300
committerMaksim Pechnikov <parallel588@gmail.com>2019-09-23 21:32:50 +0300
commit38245f13367cdc2df29ff2a499418e526b654fb5 (patch)
tree514724023f061f56e42fcaa7ae79f07d3d055c58 /docs/api/differences_in_mastoapi_responses.md
parentd4ed3a35b8aa34cd968113970bbab445eb251703 (diff)
parentfd48bd80eb7eab563c25586b1deba2ed42c02c5a (diff)
downloadpleroma-38245f13367cdc2df29ff2a499418e526b654fb5.tar.gz
pleroma-38245f13367cdc2df29ff2a499418e526b654fb5.zip
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
Diffstat (limited to 'docs/api/differences_in_mastoapi_responses.md')
-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`