diff options
author | Joas Schilling <coding@schilljs.com> | 2019-09-13 19:51:33 +0300 |
---|---|---|
committer | Joas Schilling <coding@schilljs.com> | 2019-09-19 15:55:59 +0300 |
commit | 5da475f4c060e85266b5a113f50cc207e57a53c2 (patch) | |
tree | a4485ddb28909d2eede2c72803d0b50254da7202 /lib/Controller | |
parent | 940a9351aae7dc7f95eb7a2ba35a0bc8db45a8ba (diff) |
Populate the canStartCall value and add a capability
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'lib/Controller')
-rw-r--r-- | lib/Controller/RoomController.php | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/lib/Controller/RoomController.php b/lib/Controller/RoomController.php index 7a1af4a4e..a00c82483 100644 --- a/lib/Controller/RoomController.php +++ b/lib/Controller/RoomController.php @@ -42,6 +42,7 @@ use OCP\AppFramework\Http; use OCP\AppFramework\Http\DataResponse; use OCP\AppFramework\Utility\ITimeFactory; use OCP\Comments\IComment; +use OCP\IConfig; use OCP\IL10N; use OCP\IRequest; use OCP\IUser; @@ -54,6 +55,8 @@ use Symfony\Component\EventDispatcher\GenericEvent; class RoomController extends AEnvironmentAwareController { /** @var string|null */ private $userId; + /** @var IConfig */ + private $config; /** @var TalkSession */ private $session; /** @var IUserManager */ @@ -78,6 +81,7 @@ class RoomController extends AEnvironmentAwareController { public function __construct(string $appName, ?string $UserId, IRequest $request, + IConfig $config, TalkSession $session, IUserManager $userManager, IGroupManager $groupManager, @@ -89,6 +93,7 @@ class RoomController extends AEnvironmentAwareController { ITimeFactory $timeFactory, IL10N $l10n) { parent::__construct($appName, $request); + $this->config = $config; $this->session = $session; $this->userId = $UserId; $this->userManager = $userManager; @@ -177,6 +182,7 @@ class RoomController extends AEnvironmentAwareController { 'count' => 0, 'hasPassword' => $room->hasPassword(), 'hasCall' => false, + 'canStartCall' => false, 'lastActivity' => 0, 'lastReadMessage' => 0, 'unreadMessages' => 0, @@ -244,6 +250,15 @@ class RoomController extends AEnvironmentAwareController { return $roomData; } + $defaultStartCall = (int) $this->config->getAppValue('spreed', 'start_calls', '0'); + if ($defaultStartCall === 0) { + $roomData['canStartCall'] = true; + } else if ($defaultStartCall === 1 && (!$currentParticipant->isGuest() || $currentParticipant->hasModeratorPermissions())) { + $roomData['canStartCall'] = true; + } else if ($defaultStartCall === 2 && $currentParticipant->hasModeratorPermissions()) { + $roomData['canStartCall'] = true; + } + $currentUser = $this->userManager->get($currentParticipant->getUser()); if ($currentUser instanceof IUser) { $lastReadMessage = $currentParticipant->getLastReadMessage(); |