diff options
author | Carl Schwan <carl@carlschwan.eu> | 2021-10-18 21:52:28 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-18 21:52:28 +0200 |
commit | 4eb421ee40f6ea054ac8c322c99bf76454657a24 (patch) | |
tree | f6eafcd817abb633d5d396b866b94c214311a440 /lib/private | |
parent | 285bc55d2c620eb6d9cb7514f2b9f0ed1e08d635 (diff) | |
parent | 2cb48f484bd134dd4f9af355365ac6a86f0b81d0 (diff) | |
download | nextcloud-server-4eb421ee40f6ea054ac8c322c99bf76454657a24.tar.gz nextcloud-server-4eb421ee40f6ea054ac8c322c99bf76454657a24.zip |
Merge pull request #28403 from nextcloud/work/status
Add an API to set and rollback the user status
Diffstat (limited to 'lib/private')
-rw-r--r-- | lib/private/UserStatus/ISettableProvider.php | 55 | ||||
-rw-r--r-- | lib/private/UserStatus/Manager.php | 35 |
2 files changed, 82 insertions, 8 deletions
diff --git a/lib/private/UserStatus/ISettableProvider.php b/lib/private/UserStatus/ISettableProvider.php new file mode 100644 index 00000000000..fc0d502845e --- /dev/null +++ b/lib/private/UserStatus/ISettableProvider.php @@ -0,0 +1,55 @@ +<?php + +declare(strict_types=1); + +/** + * @copyright Copyright (c) 2021 Carl Schwan <carl@carlschwan.eu> + * + * @author Carl Schwan <carl@carlschwan.eu> + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +namespace OC\UserStatus; + +use OCP\UserStatus\IProvider; + +/** + * Interface ISettableProvider + * @package OC\UserStatus + */ +interface ISettableProvider extends IProvider { + /** + * Set a new status for the selected user. + * + * @param string $userId The user for which we want to update the status. + * @param string $messageId The new message id. + * @param string $status The new status. + * @param bool $createBackup If true, this will store the old status so that it is possible to revert it later (e.g. after a call). + */ + public function setUserStatus(string $userId, string $messageId, string $status, bool $createBackup): void; + + /** + * Revert an automatically set user status. For example after leaving a call, + * change back to the previously set status. If the user has already updated + * their status, this method does nothing. + * + * @param string $userId The user for which we want to update the status. + * @param string $messageId The expected current messageId. + * @param string $status The expected current status. + */ + public function revertUserStatus(string $userId, string $messageId, string $status): void; +} diff --git a/lib/private/UserStatus/Manager.php b/lib/private/UserStatus/Manager.php index 9e48b284e92..bca80bc5b03 100644 --- a/lib/private/UserStatus/Manager.php +++ b/lib/private/UserStatus/Manager.php @@ -25,21 +25,21 @@ declare(strict_types=1); */ namespace OC\UserStatus; -use OCP\ILogger; use OCP\IServerContainer; use OCP\UserStatus\IManager; use OCP\UserStatus\IProvider; use Psr\Container\ContainerExceptionInterface; +use Psr\Log\LoggerInterface; class Manager implements IManager { /** @var IServerContainer */ private $container; - /** @var ILogger */ + /** @var LoggerInterface */ private $logger; - /** @var null */ + /** @var class-string */ private $providerClass; /** @var IProvider */ @@ -49,10 +49,10 @@ class Manager implements IManager { * Manager constructor. * * @param IServerContainer $container - * @param ILogger $logger + * @param LoggerInterface $logger */ public function __construct(IServerContainer $container, - ILogger $logger) { + LoggerInterface $logger) { $this->container = $container; $this->logger = $logger; } @@ -90,16 +90,35 @@ class Manager implements IManager { return; } + /** + * @psalm-suppress InvalidCatch + */ try { $provider = $this->container->get($this->providerClass); } catch (ContainerExceptionInterface $e) { - $this->logger->logException($e, [ - 'message' => 'Could not load user-status provider dynamically: ' . $e->getMessage(), - 'level' => ILogger::ERROR, + $this->logger->error('Could not load user-status "' . $this->providerClass . '" provider dynamically: ' . $e->getMessage(), [ + 'exception' => $e, ]); return; } $this->provider = $provider; } + + public function setUserStatus(string $userId, string $messageId, string $status, bool $createBackup = false): void { + $this->setupProvider(); + if (!$this->provider || !($this->provider instanceof ISettableProvider)) { + return; + } + + $this->provider->setUserStatus($userId, $messageId, $status, $createBackup); + } + + public function revertUserStatus(string $userId, string $messageId, string $status): void { + $this->setupProvider(); + if (!$this->provider || !($this->provider instanceof ISettableProvider)) { + return; + } + $this->provider->revertUserStatus($userId, $messageId, $status); + } } |