From c071fbf3ac9b0f2c7e02db58219fc1edd898001b Mon Sep 17 00:00:00 2001 From: Anna Larch Date: Thu, 8 Feb 2024 18:10:59 +0100 Subject: [PATCH] fix(userstatus): add back 0 timestamp for status without message Signed-off-by: Anna Larch --- apps/user_status/lib/Service/StatusService.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/apps/user_status/lib/Service/StatusService.php b/apps/user_status/lib/Service/StatusService.php index 813f6b9d4e1..be3a12ef44d 100644 --- a/apps/user_status/lib/Service/StatusService.php +++ b/apps/user_status/lib/Service/StatusService.php @@ -297,7 +297,13 @@ class StatusService { $userStatus->setCustomIcon(null); $userStatus->setCustomMessage($customMessage); $userStatus->setClearAt(null); - $userStatus->setStatusMessageTimestamp($this->timeFactory->now()->getTimestamp()); + if ($this->predefinedStatusService->getTranslatedStatusForId($messageId) !== null + || ($customMessage !== null && $customMessage !== '')) { + // Only track status message ID if there is one + $userStatus->setStatusMessageTimestamp($this->timeFactory->now()->getTimestamp()); + } else { + $userStatus->setStatusMessageTimestamp(0); + } if ($userStatus->getId() !== null) { return $this->mapper->update($userStatus); -- 2.39.5