From 44127d4bf657fd189ef27993769351a209aeca3f Mon Sep 17 00:00:00 2001 From: Julien Veyssier Date: Wed, 7 Sep 2022 11:56:04 +0200 Subject: [PATCH] use since param to build widget item list Signed-off-by: Julien Veyssier --- lib/Dashboard/DeckWidget.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/Dashboard/DeckWidget.php b/lib/Dashboard/DeckWidget.php index 80c9ccca1..669212850 100644 --- a/lib/Dashboard/DeckWidget.php +++ b/lib/Dashboard/DeckWidget.php @@ -116,10 +116,11 @@ public function load(): void { public function getItems(string $userId, ?string $since = null, int $limit = 7): array { $upcomingCards = $this->dashboardService->findUpcomingCards($userId); $nowTimestamp = (new Datetime())->getTimestamp(); - $upcomingCards = array_filter($upcomingCards, static function(array $card) use ($nowTimestamp) { + $sinceTimestamp = $since !== null ? (new Datetime($since))->getTimestamp() : null; + $upcomingCards = array_filter($upcomingCards, static function(array $card) use ($nowTimestamp, $sinceTimestamp) { if ($card['duedate']) { $ts = (new Datetime($card['duedate']))->getTimestamp(); - return $ts > $nowTimestamp; + return $ts > $nowTimestamp && ($sinceTimestamp === null || $ts > $sinceTimestamp); } return false; });