Merge pull request #43530 from nextcloud/backport/43464/stable28

[stable28] fix(userstatus): add back 0 timestamp for status without message
nextcloud · Feb 16, 2024 · e108fd2 · e108fd2
2 parents e622875 + ca179b7
commit e108fd2
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/apps/user_status/lib/Service/StatusService.php b/apps/user_status/lib/Service/StatusService.php
@@ -297,7 +297,13 @@ public function setUserStatus(string $userId,
 		$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);