Also check the expiration on all other renderings

Signed-off-by: Joas Schilling <coding@schilljs.com> Signed-off-by: Vitor Mattos <vitor@php.rio>
nextcloud · Jan 4, 2023 · 0a5a9a1 · 0a5a9a1
1 parent 26b8738
commit 0a5a9a1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/lib/Controller/ChatController.php b/lib/Controller/ChatController.php
@@ -466,7 +466,7 @@ public function receiveMessages(int $lookIntoFuture,
 		$this->preloadShares($comments);
 
 		$i = 0;
-		$now = $this->timeFactory->getDateTime('now', new \DateTimeZone('UTC'));
+		$now = $this->timeFactory->getDateTime();
 		$messages = $commentIdToIndex = $parentIds = [];
 		foreach ($comments as $comment) {
 			$id = (int) $comment->getId();
@@ -475,7 +475,8 @@ public function receiveMessages(int $lookIntoFuture,
 
 			$expireDate = $message->getComment()->getExpireDate();
 			if ($expireDate instanceof \DateTime && $expireDate < $now) {
-				$message->setVisibility(false);
+				$commentIdToIndex[$id] = null;
+				continue;
 			}
 
 			if (!$message->getVisibility()) {

diff --git a/lib/Dashboard/TalkWidget.php b/lib/Dashboard/TalkWidget.php
@@ -31,6 +31,7 @@
 use OCA\Talk\Manager;
 use OCA\Talk\Participant;
 use OCA\Talk\Room;
+use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\Comments\IComment;
 use OCP\Dashboard\IAPIWidget;
 use OCP\Dashboard\IButtonWidget;
@@ -50,14 +51,16 @@ class TalkWidget implements IAPIWidget, IIconWidget, IButtonWidget, IOptionWidge
 	private IL10N $l10n;
 	private Manager $manager;
 	private MessageParser $messageParser;
+	protected ITimeFactory $timeFactory;
 
 	public function __construct(
 		IUserSession $userSession,
 		Config $talkConfig,
 		IURLGenerator $url,
 		IL10N $l10n,
 		Manager $manager,
-		MessageParser $messageParser
+		MessageParser $messageParser,
+		ITimeFactory $timeFactory
 	) {
 		$user = $userSession->getUser();
 		if ($user instanceof IUser && $talkConfig->isDisabledForUser($user)) {