fix(userstatus): add back 0 timestamp for status without message

Signed-off-by: Anna Larch <anna@nextcloud.com>

diff --git a/apps/user_status/lib/Service/StatusService.php b/apps/user_status/lib/Service/StatusService.php
index 813f6b9d4e171f79f63102b4a4ea45999653c833..be3a12ef44dea108d7c1ad05aa5ab04438b86ae5 100644 (file)
--- 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);