Merge branch 'master' into develop

This commit is contained in:
Benjamin Neff 2017-12-29 20:39:04 +01:00
commit e914419f40
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
2 changed files with 4 additions and 4 deletions

View file

@ -6,8 +6,8 @@ This entity represents a like to some kind of post (e.g. status message).
The `parent_type` can be one of:
* [Post][post] ([StatusMessage][status_message] or currently still a [Reshare][reshare])
* [Comment][comment] (diaspora\* doesn't support this at the moment)
* [Post][post] (if it's a [StatusMessage][status_message] or currently still a [Reshare][reshare])
* [Comment][comment] (diaspora\* doesn't fully support this at the moment, but likes of comments are relayed)
See also: [Relayable][relayable]

View file

@ -4,14 +4,14 @@ title: Participation
A participation is sent to subscribe a person on updates for some [Post][post].
The `parent_type` can only be a [Post][post] ([StatusMessage][status_message] or [Reshare][reshare])
The `parent_type` can only be a [Post][post] (if it's a [StatusMessage][status_message] or [Reshare][reshare])
## Properties
| Property | Type | Description |
| ------------- | ---------------------------- | ----------------------------------------------------- |
| `author` | [diaspora\* ID][diaspora-id] | The diaspora\* ID of the author of the participation. |
| `guid` | [GUID][guid] | The GUID of the comment. |
| `guid` | [GUID][guid] | The GUID of the participation. |
| `parent_guid` | [GUID][guid] | The GUID of the parent entity. |
| `parent_type` | [Type][type] | The entity type of the parent. |