Merge pull request #42532 from nextcloud/fix/user_status/custom-messa…

…ge-icon-only
nextcloud · Jan 10, 2024 · ee710d1 · ee710d1
2 parents 379d323 + b8fecdb
commit ee710d1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/apps/user_status/lib/Controller/UserStatusController.php b/apps/user_status/lib/Controller/UserStatusController.php
@@ -149,7 +149,7 @@ public function setCustomMessage(?string $statusIcon,
 		?string $message,
 		?int $clearAt): DataResponse {
 		try {
-			if (($message !== null && $message !== '') || ($clearAt !== null && $clearAt !== 0)) {
+			if (($statusIcon !== null && $statusIcon !== '') || ($message !== null && $message !== '') || ($clearAt !== null && $clearAt !== 0)) {
 				$status = $this->service->setCustomMessage($this->userId, $statusIcon, $message, $clearAt);
 			} else {
 				$this->service->clearMessage($this->userId);

diff --git a/apps/user_status/tests/Unit/Controller/UserStatusControllerTest.php b/apps/user_status/tests/Unit/Controller/UserStatusControllerTest.php
@@ -330,7 +330,7 @@ public function setCustomMessageDataProvider(): array {
 		return [
 			['👨🏽‍💻', 'Busy developing the status feature', 500, true, false, null, false, null],
 			['👨🏽‍💻', '', 500, true, false, null, false, null, false],
-			['👨🏽‍💻', '', 0, true, false, null, false, null, true],
+			['👨🏽‍💻', '', 0, true, false, null, false, null, false],
 			['👨🏽‍💻', 'Busy developing the status feature', 500, false, true, new InvalidClearAtException('Original exception message'), true,
 				'New user-status for "john.doe" was rejected due to an invalid clearAt value "500"'],
 			['👨🏽‍💻', 'Busy developing the status feature', 500, false, true, new InvalidStatusIconException('Original exception message'), true,