fix(user_status): Allow setting custom message with icon only

Signed-off-by: provokateurin <kate@provokateurin.de>

diff --git a/apps/user_status/lib/Controller/UserStatusController.php b/apps/user_status/lib/Controller/UserStatusController.php
index 3beb8abc3abd0db2e5865f2dc2d0b57119d53faf..a85f4f1353a2c4ed89616f2d97e9f30fa5831ec6 100644 (file)
--- a/apps/user_status/lib/Controller/UserStatusController.php
+++ b/apps/user_status/lib/Controller/UserStatusController.php
@@ -149,7 +149,7 @@ class UserStatusController extends OCSController {
                ?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
index 6161eb100ec1808cdf5aec4470c17a93a3c7916b..d3b6d2002e0ab6fb60f05ad27f66f063884b47a7 100644 (file)
--- a/apps/user_status/tests/Unit/Controller/UserStatusControllerTest.php
+++ b/apps/user_status/tests/Unit/Controller/UserStatusControllerTest.php
@@ -330,7 +330,7 @@ class UserStatusControllerTest extends TestCase {
                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,