No push notifications when in DND

Signed-off-by: Joas Schilling <coding@schilljs.com>

Author: nickvergessen

lib/Push.php

@@ -39,6 +39,8 @@
 use OCP\L10N\IFactory;
 use OCP\Notification\IManager as INotificationManager;
 use OCP\Notification\INotification;
+use OCP\UserStatus\IManager as IUserStatusManager;
+use OCP\UserStatus\IUserStatus;
 use Symfony\Component\Console\Output\OutputInterface;
 
 class Push {
@@ -58,6 +60,8 @@ class Push {
 	protected $clientService;
 	/** @var ICache */
 	protected $cache;
+	/** @var IUserStatusManager */
+	protected $userStatusManager;
 	/** @var IFactory */
 	protected $l10nFactory;
 	/** @var ILogger */
@@ -77,6 +81,7 @@ public function __construct(IDBConnection $connection,
 								IUserManager $userManager,
 								IClientService $clientService,
 								ICacheFactory $cacheFactory,
+								IUserStatusManager $userStatusManager,
 								IFactory $l10nFactory,
 								ILogger $log) {
 		$this->db = $connection;
@@ -87,6 +92,7 @@ public function __construct(IDBConnection $connection,
 		$this->userManager = $userManager;
 		$this->clientService = $clientService;
 		$this->cache = $cacheFactory->createDistributed('pushtokens');
+		$this->userStatusManager = $userStatusManager;
 		$this->l10nFactory = $l10nFactory;
 		$this->log = $log;
 	}
@@ -124,6 +130,18 @@ public function pushToDevice(int $id, INotification $notification, ?OutputInterf
 			return;
 		}
 
+		$userStatus = $this->userStatusManager->getUserStatuses([
+			$notification->getUser(),
+		]);
+
+		if (isset($userStatus[$notification->getUser()])) {
+			$userStatus = $userStatus[$notification->getUser()];
+			if ($userStatus->getStatus() === IUserStatus::DND) {
+				$this->printInfo('User status is set to DND');
+				return;
+			}
+		}
+
 		$devices = $this->getDevicesForUser($notification->getUser());
 		if (empty($devices)) {
 			$this->printInfo('No devices found for user');

tests/Unit/PushTest.php

@@ -42,6 +42,7 @@
 use OCP\L10N\IFactory;
 use OCP\Notification\IManager as INotificationManager;
 use OCP\Notification\INotification;
+use OCP\UserStatus\IManager as IUserStatusManager;
 use PHPUnit\Framework\MockObject\MockObject;
 
 /**
@@ -69,6 +70,8 @@ class PushTest extends TestCase {
 	protected $cacheFactory;
 	/** @var ICache|MockObject */
 	protected $cache;
+	/** @var IUserStatusManager|MockObject */
+	protected $userStatusManager;
 	/** @var IFactory|MockObject */
 	protected $l10nFactory;
 	/** @var ILogger|MockObject */
@@ -86,6 +89,7 @@ protected function setUp(): void {
 		$this->clientService = $this->createMock(IClientService::class);
 		$this->cacheFactory = $this->createMock(ICacheFactory::class);
 		$this->cache = $this->createMock(ICache::class);
+		$this->userStatusManager = $this->createMock(IUserStatusManager::class);
 		$this->l10nFactory = $this->createMock(IFactory::class);
 		$this->logger = $this->createMock(ILogger::class);
 
@@ -110,6 +114,7 @@ protected function getPush(array $methods = []) {
 					$this->userManager,
 					$this->clientService,
 					$this->cacheFactory,
+					$this->userStatusManager,
 					$this->l10nFactory,
 					$this->logger,
 				])
@@ -126,6 +131,7 @@ protected function getPush(array $methods = []) {
 			$this->userManager,
 			$this->clientService,
 			$this->cacheFactory,
+			$this->userStatusManager,
 			$this->l10nFactory,
 			$this->logger
 		);