diff options
author | Joas Schilling <213943+nickvergessen@users.noreply.github.com> | 2022-12-21 18:33:51 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-21 18:33:51 +0100 |
commit | e6238d91aed4701f38c29a2d840de606d8779907 (patch) | |
tree | bb409864a6d09999784d18f636d5aa2c6110148a | |
parent | 40bdb769599d5079cfa256764cb8d17b4706f675 (diff) | |
parent | c999fb9e26f944985ad63b9ec6d650ae3ac71e06 (diff) |
Merge pull request #8471 from nextcloud/feature/documentation-and-expose-property
Update documentation and expose room property
-rw-r--r-- | docs/conversation.md | 2 | ||||
-rw-r--r-- | lib/Controller/RoomController.php | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/docs/conversation.md b/docs/conversation.md index 7948deeb0..5348c8440 100644 --- a/docs/conversation.md +++ b/docs/conversation.md @@ -91,6 +91,8 @@ | `participants` | array | v1 | v2 | **Removed** | | `guestList` | string | v1 | v2 | **Removed** | | `avatarUrl` | string | v4 | | Avatar URL of the conversation including a version flag `v=…` for easier expiration of the avatar in case a moderator updates it, since the avatar endpoint should be cached for 24 hours. | +| `callStartTime` | int | v4 | | Timestamp when the call was started (only available with `recording-v1` capability) | +| `callRecording` | int | v4 | | Type of call recording (see [Constants - Call recording status](constants.md#call-recording-status)) (only available with `recording-v1` capability) | ## Creating a new conversation diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php index 20e00f534..6f509c5da 100644 --- a/lib/Controller/RoomController.php +++ b/lib/Controller/RoomController.php @@ -399,6 +399,7 @@ class RoomController extends AEnvironmentAwareController { 'hasPassword' => $room->hasPassword(), 'hasCall' => false, 'callStartTime' => 0, + 'callRecording' => Room::RECORDING_NONE, 'canStartCall' => false, 'lastActivity' => 0, 'lastReadMessage' => 0, @@ -468,6 +469,8 @@ class RoomController extends AEnvironmentAwareController { 'listable' => $room->getListable(), 'breakoutRoomMode' => $room->getBreakoutRoomMode(), 'breakoutRoomStatus' => $room->getBreakoutRoomStatus(), + 'callStartTime' => $room->getActiveSince() instanceof \DateTimeInterface ? $room->getActiveSince()->getTimestamp() : 0, + 'callRecording' => $room->getCallRecording(), ]); } @@ -487,6 +490,7 @@ class RoomController extends AEnvironmentAwareController { 'readOnly' => $room->getReadOnly(), 'hasCall' => $room->getActiveSince() instanceof \DateTimeInterface, 'callStartTime' => $room->getActiveSince() instanceof \DateTimeInterface ? $room->getActiveSince()->getTimestamp() : 0, + 'callRecording' => $room->getCallRecording(), 'lastActivity' => $lastActivity, 'callFlag' => $room->getCallFlag(), 'isFavorite' => $attendee->isFavorite(), |