3 files changed, 42 insertions, 21 deletions

diff --git a/apps/user_status/lib/Service/JSDataService.php b/apps/user_status/lib/Service/JSDataService.php
index a6b9b0b4056..a777e97fe57 100644
--- a/apps/user_status/lib/Service/JSDataService.php
+++ b/apps/user_status/lib/Service/JSDataService.php
@@ -14,22 +14,16 @@ use OCP\UserStatus\IUserStatus;
 
 class JSDataService implements \JsonSerializable {
 
-	/** @var IUserSession */
-	private $userSession;
-
-	/** @var StatusService */
-	private $statusService;
-
 	/**
 	 * JSDataService constructor.
 	 *
 	 * @param IUserSession $userSession
 	 * @param StatusService $statusService
 	 */
-	public function __construct(IUserSession $userSession,
-		StatusService $statusService) {
-		$this->userSession = $userSession;
-		$this->statusService = $statusService;
+	public function __construct(
+		private IUserSession $userSession,
+		private StatusService $statusService,
+	) {
 	}
 
 	public function jsonSerialize(): array {
diff --git a/apps/user_status/lib/Service/PredefinedStatusService.php b/apps/user_status/lib/Service/PredefinedStatusService.php
index b17442a0caa..599d5b8b52f 100644
--- a/apps/user_status/lib/Service/PredefinedStatusService.php
+++ b/apps/user_status/lib/Service/PredefinedStatusService.php
@@ -20,6 +20,7 @@ use OCP\UserStatus\IUserStatus;
  * @package OCA\UserStatus\Service
  */
 class PredefinedStatusService {
+	private const BE_RIGHT_BACK = 'be-right-back';
 	private const MEETING = 'meeting';
 	private const COMMUTING = 'commuting';
 	private const SICK_LEAVE = 'sick-leave';
@@ -31,16 +32,14 @@ class PredefinedStatusService {
 	public const CALL = 'call';
 	public const OUT_OF_OFFICE = 'out-of-office';
 
-	/** @var IL10N */
-	private $l10n;
-
 	/**
 	 * DefaultStatusService constructor.
 	 *
 	 * @param IL10N $l10n
 	 */
-	public function __construct(IL10N $l10n) {
-		$this->l10n = $l10n;
+	public function __construct(
+		private IL10N $l10n,
+	) {
 	}
 
 	/**
@@ -67,6 +66,15 @@ class PredefinedStatusService {
 				],
 			],
 			[
+				'id' => self::BE_RIGHT_BACK,
+				'icon' => '⏳',
+				'message' => $this->getTranslatedStatusForId(self::BE_RIGHT_BACK),
+				'clearAt' => [
+					'type' => 'period',
+					'time' => 900,
+				],
+			],
+			[
 				'id' => self::REMOTE_WORK,
 				'icon' => '🏡',
 				'message' => $this->getTranslatedStatusForId(self::REMOTE_WORK),
@@ -145,6 +153,9 @@ class PredefinedStatusService {
 			case self::REMOTE_WORK:
 				return '🏡';
 
+			case self::BE_RIGHT_BACK:
+				return '⏳';
+
 			case self::CALL:
 				return '💬';
 
@@ -181,6 +192,9 @@ class PredefinedStatusService {
 			case self::CALL:
 				return $this->l10n->t('In a call');
 
+			case self::BE_RIGHT_BACK:
+				return $this->l10n->t('Be right back');
+
 			default:
 				return null;
 		}
@@ -197,6 +211,7 @@ class PredefinedStatusService {
 			self::SICK_LEAVE,
 			self::VACATIONING,
 			self::OUT_OF_OFFICE,
+			self::BE_RIGHT_BACK,
 			self::REMOTE_WORK,
 			IUserStatus::MESSAGE_CALL,
 			IUserStatus::MESSAGE_AVAILABILITY,
diff --git a/apps/user_status/lib/Service/StatusService.php b/apps/user_status/lib/Service/StatusService.php
index 2a761a0f304..188eb26d1d7 100644
--- a/apps/user_status/lib/Service/StatusService.php
+++ b/apps/user_status/lib/Service/StatusService.php
@@ -167,7 +167,7 @@ class StatusService {
 		$userStatus->setIsBackup(false);
 
 		if ($userStatus->getId() === null) {
-			return $this->mapper->insert($userStatus);
+			return $this->insertWithoutThrowingUniqueConstrain($userStatus);
 		}
 
 		return $this->mapper->update($userStatus);
@@ -211,7 +211,7 @@ class StatusService {
 		$userStatus->setStatusMessageTimestamp($this->timeFactory->now()->getTimestamp());
 
 		if ($userStatus->getId() === null) {
-			return $this->mapper->insert($userStatus);
+			return $this->insertWithoutThrowingUniqueConstrain($userStatus);
 		}
 
 		return $this->mapper->update($userStatus);
@@ -313,7 +313,7 @@ class StatusService {
 		if ($userStatus->getId() !== null) {
 			return $this->mapper->update($userStatus);
 		}
-		return $this->mapper->insert($userStatus);
+		return $this->insertWithoutThrowingUniqueConstrain($userStatus);
 	}
 
 	/**
@@ -360,7 +360,7 @@ class StatusService {
 		$userStatus->setStatusMessageTimestamp($this->timeFactory->now()->getTimestamp());
 
 		if ($userStatus->getId() === null) {
-			return $this->mapper->insert($userStatus);
+			return $this->insertWithoutThrowingUniqueConstrain($userStatus);
 		}
 
 		return $this->mapper->update($userStatus);
@@ -499,10 +499,10 @@ class StatusService {
 			return;
 		}
 		// If there is a custom message, don't overwrite it
-		if(empty($status->getCustomMessage())) {
+		if (empty($status->getCustomMessage())) {
 			$status->setCustomMessage($predefinedMessage['message']);
 		}
-		if(empty($status->getCustomIcon())) {
+		if (empty($status->getCustomIcon())) {
 			$status->setCustomIcon($predefinedMessage['icon']);
 		}
 	}
@@ -584,4 +584,16 @@ class StatusService {
 		// For users that matched restore the previous status
 		$this->mapper->restoreBackupStatuses($restoreIds);
 	}
+
+	protected function insertWithoutThrowingUniqueConstrain(UserStatus $userStatus): UserStatus {
+		try {
+			return $this->mapper->insert($userStatus);
+		} catch (Exception $e) {
+			// Ignore if a parallel request already set the status
+			if ($e->getReason() !== Exception::REASON_UNIQUE_CONSTRAINT_VIOLATION) {
+				throw $e;
+			}
+		}
+		return $userStatus;
+	}
 }