aboutsummaryrefslogtreecommitdiffstats
path: root/apps/user_status
diff options
context:
space:
mode:
authorprovokateurin <kate@provokateurin.de>2023-12-30 14:38:58 +0100
committerprovokateurin <kate@provokateurin.de>2023-12-30 14:45:35 +0100
commitb8fecdb470ba5bc19946d5a751aa4925695e01cf (patch)
tree524f73649f5bd348716a5099f3433b32a8ba2964 /apps/user_status
parentb15b12d5ecd65f6586332753f20b3c82f4dd82a5 (diff)
downloadnextcloud-server-b8fecdb470ba5bc19946d5a751aa4925695e01cf.tar.gz
nextcloud-server-b8fecdb470ba5bc19946d5a751aa4925695e01cf.zip
fix(user_status): Allow setting custom message with icon only
Signed-off-by: provokateurin <kate@provokateurin.de>
Diffstat (limited to 'apps/user_status')
-rw-r--r--apps/user_status/lib/Controller/UserStatusController.php2
-rw-r--r--apps/user_status/tests/Unit/Controller/UserStatusControllerTest.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/user_status/lib/Controller/UserStatusController.php b/apps/user_status/lib/Controller/UserStatusController.php
index 3beb8abc3ab..a85f4f1353a 100644
--- 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 6161eb100ec..d3b6d2002e0 100644
--- 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,