diff options
| author | Vincent Petry <vincent@nextcloud.com> | 2021-06-07 16:18:23 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-07 16:18:23 +0300 |
| commit | 1b4e1d121751e33cf0edc9d6ee5108c551817100 (patch) | |
| tree | abc2bfeac02e7807fee5c30de609a953f26a77d2 /docs | |
| parent | 554cb76e2130f268d5f434946228f027270a7142 (diff) | |
| parent | 6116591ca1e51d9ccf81100bd18047578da4c84a (diff) | |
Merge pull request #5717 from nextcloud/bugfix/noid/circles-too
Document circles too
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/constants.md | 4 | ||||
| -rw-r--r-- | docs/conversation.md | 2 | ||||
| -rw-r--r-- | docs/participant.md | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/docs/constants.md b/docs/constants.md index f32bd3265..7f0137381 100644 --- a/docs/constants.md +++ b/docs/constants.md @@ -53,14 +53,16 @@ title: Constants ### Attendee types * `users` - Logged-in users * `groups` - Groups +* `circles` - [Circle from the Circles app](https://github.com/nextcloud/circles) * `guests` - Guest without a login * `emails` - A guest invited by email address ### Actor types of chat messages * `guests` - guest users * `users` - logged-in users -* `emails` - users invited by email +* `emails` - A guest invited by email * `groups` - groups +* `circles` - [Circle from the Circles app](https://github.com/nextcloud/circles) * `bots` - used by commands (actor-id is the used `/command`) and the changelog conversation (actor-id is `changelog`) ## Signaling modes diff --git a/docs/conversation.md b/docs/conversation.md index 842bf6132..d2d139d1e 100644 --- a/docs/conversation.md +++ b/docs/conversation.md @@ -35,7 +35,7 @@ `participantType` | int | v1 | | Permissions level of the current user `attendeeId` | int | v3 | | Unique attendee id `attendeePin` | string | v3 | | Unique dial-in authentication code for this user, when the conversation has SIP enabled (see `sipEnabled` attribute) - `actorType` | string | v3 | | Currently known `users|guests|emails|groups` + `actorType` | string | v3 | | Currently known `users|guests|emails|groups|circles` `actorId` | string | v3 | | The unique identifier for the given actor type `participantInCall` | bool | v1 | v2 | **Removed:** use `participantFlags` instead `participantFlags` | int | v1 | | "In call" flags of the user's session making the request (only available with `in-call-flags` capability) diff --git a/docs/participant.md b/docs/participant.md index 92d42526a..336f6bf4b 100644 --- a/docs/participant.md +++ b/docs/participant.md @@ -28,7 +28,7 @@ field | type | Added | Removed | Description ---|---|---|---|--- `attendeeId` | int | v3 | | Unique attendee id - `actorType` | string | v3 | | Currently known `users|guests|emails|groups` + `actorType` | string | v3 | | Currently known `users|guests|emails|groups|circles` `actorId` | string | v3 | | The unique identifier for the given actor type `displayName` | string | v1 | | Can be empty for guests `participantType` | int | v1 | | Permissions level of the participant (see [constants list](constants.md#participant-types)) |