Skip to content

Commit 34d17af

Browse files
committed
fix(userstatus): add back 0 timestamp for status without message
Signed-off-by: Anna Larch <[email protected]>
1 parent cdf7840 commit 34d17af

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

apps/user_status/lib/Service/StatusService.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,13 @@ public function setUserStatus(string $userId,
297297
$userStatus->setCustomIcon(null);
298298
$userStatus->setCustomMessage($customMessage);
299299
$userStatus->setClearAt(null);
300-
$userStatus->setStatusMessageTimestamp($this->timeFactory->now()->getTimestamp());
300+
if ($this->predefinedStatusService->getTranslatedStatusForId($messageId) !== null
301+
|| ($customMessage !== null && $customMessage !== '')) {
302+
// Only track status message ID if there is one
303+
$userStatus->setStatusMessageTimestamp($this->timeFactory->now()->getTimestamp());
304+
} else {
305+
$userStatus->setStatusMessageTimestamp(0);
306+
}
301307

302308
if ($userStatus->getId() !== null) {
303309
return $this->mapper->update($userStatus);

0 commit comments

Comments
 (0)